Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2015-07-14 18:32:12 +00:00 committed by Gerrit Code Review
commit e5e2111a4f
2 changed files with 3 additions and 2 deletions

View File

@ -25,7 +25,7 @@ oslo.context>=0.2.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.messaging!=1.12.0,>=1.8.0 # Apache-2.0
oslo.messaging>=1.16.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

@ -9,7 +9,8 @@ coverage>=3.6
discover
fixtures>=1.3.1
hacking<0.11,>=0.10.0 # Apache-2.0
mock>=1.0
mock>=1.1;python_version!='2.6'
mock==1.0.1;python_version=='2.6'
oslosphinx>=2.5.0 # Apache-2.0
oslotest>=1.5.1 # Apache-2.0
python-subunit>=0.0.18