Merge "Updated from global requirements"

This commit is contained in:
Jenkins
2015-10-13 08:00:24 +00:00
committed by Gerrit Code Review
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -11,7 +11,7 @@ eventlet>=0.17.4
PasteDeploy>=1.5.0
Routes!=2.0,!=2.1,>=1.12.3;python_version=='2.7'
Routes!=2.0,>=1.12.3;python_version!='2.7'
WebOb>=1.2.3
WebOb<1.5.0,>=1.2.3
sqlalchemy-migrate>=0.9.6
httplib2>=0.7.5
pycrypto>=2.6
@@ -39,7 +39,7 @@ six>=1.9.0
oslo.db>=2.4.1 # Apache-2.0
oslo.i18n>=1.5.0 # Apache-2.0
oslo.log>=1.8.0 # Apache-2.0
oslo.messaging!=1.17.0,!=1.17.1,>=1.16.0 # Apache-2.0
oslo.messaging!=1.17.0,!=1.17.1,!=2.6.0,>=1.16.0 # Apache-2.0
oslo.middleware>=2.8.0 # Apache-2.0
oslo.policy>=0.5.0 # Apache-2.0
oslo.serialization>=1.4.0 # Apache-2.0
+1 -1
View File
@@ -14,7 +14,7 @@ fixtures>=1.3.1
mox3>=0.7.0
mock>=1.2
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
requests>=2.5.2
requests!=2.8.0,>=2.5.2
testrepository>=0.0.18
testresources>=0.2.4
testscenarios>=0.4