Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2015-07-19 06:29:37 +00:00 committed by Gerrit Code Review
commit 90a084b5fd
2 changed files with 4 additions and 4 deletions

View File

@ -17,14 +17,14 @@ sqlalchemy-migrate>=0.9.6
stevedore>=1.5.0 # Apache-2.0
passlib
python-keystoneclient>=1.6.0
keystonemiddleware>=1.5.0
keystonemiddleware>=2.0.0
oslo.concurrency>=2.1.0 # Apache-2.0
oslo.config>=1.11.0 # Apache-2.0
oslo.messaging>=1.16.0 # Apache-2.0
oslo.db>=1.12.0 # Apache-2.0
oslo.i18n>=1.5.0 # Apache-2.0
oslo.log>=1.2.0 # Apache-2.0
oslo.middleware!=2.0.0,>=1.2.0 # Apache-2.0
oslo.log>=1.6.0 # Apache-2.0
oslo.middleware>=2.4.0 # Apache-2.0
oslo.policy>=0.5.0 # Apache-2.0
oslo.serialization>=1.4.0 # Apache-2.0
oslo.service>=0.1.0 # Apache-2.0

View File

@ -24,7 +24,7 @@ fixtures>=1.3.1
# xml parsing
lxml>=2.3
# mock object framework
mock>=1.1;python_version!='2.6'
mock!=1.1.4,>=1.1;python_version!='2.6'
mock==1.0.1;python_version=='2.6'
oslotest>=1.7.0 # Apache-2.0
# required to build documentation