Merge "Updated from global requirements" into stable/havana

This commit is contained in:
Jenkins 2014-07-24 17:45:31 +00:00 committed by Gerrit Code Review
commit ad3b509e7d
2 changed files with 3 additions and 3 deletions

View File

@ -8,7 +8,7 @@ eventlet>=0.13.0
Jinja2
kombu>=2.4.8
lxml>=2.3
Routes>=1.12.3
Routes>=1.12.3,!=2.0
WebOb>=1.2.3,<1.3
greenlet>=0.3.2
PasteDeploy>=1.5.0
@ -22,7 +22,7 @@ Babel>=1.3
iso8601>=0.1.8
jsonschema>=1.3.0,!=1.4.0
python-cinderclient>=1.0.6
python-neutronclient>=2.3.0,<3
python-neutronclient>=2.3.4,<3
python-glanceclient>=0.9.0
python-keystoneclient>=0.3.2
six>=1.4.1

View File

@ -9,7 +9,7 @@ MySQL-python
psycopg2
pylint==0.25.2
python-subunit
sphinx>=1.1.2,<1.2
sphinx>=1.1.2,<1.1.999
oslo.sphinx
testrepository>=0.0.17
testtools>=0.9.32