Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2015-10-13 15:27:04 +00:00 committed by Gerrit Code Review
commit da57fe2b34
2 changed files with 3 additions and 3 deletions

@ -11,7 +11,7 @@ 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'
retrying!=1.3.0,>=1.2.3 # Apache-2.0
WebOb>=1.2.3
WebOb<1.5.0,>=1.2.3
kombu>=3.0.7
psutil<2.0.0,>=1.1.1
iso8601>=0.1.9
@ -35,7 +35,7 @@ oslo.db>=2.4.1 # Apache-2.0
oslo.config>=2.3.0 # Apache-2.0
oslo.context>=0.2.0 # Apache-2.0
oslo.policy>=0.5.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.serialization>=1.4.0 # Apache-2.0
oslo.service>=0.9.0 # Apache-2.0

@ -10,7 +10,7 @@ nose
oslotest>=1.10.0 # Apache-2.0
posix-ipc
sqlalchemy-migrate>=0.9.6
tempest-lib>=0.9.0
tempest-lib>=0.10.0
testrepository>=0.0.18
testresources>=0.2.4
testscenarios>=0.4