Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2015-07-28 23:39:32 +00:00 committed by Gerrit Code Review
commit eef14bab03
2 changed files with 4 additions and 5 deletions

View File

@ -11,8 +11,8 @@ alembic>=0.7.2
six>=1.9.0
oslo.config>=1.11.0 # Apache-2.0
oslo.db>=1.12.0 # Apache-2.0
oslo.log>=1.2.0 # Apache-2.0
oslo.messaging>=1.16.0 # Apache-2.0
oslo.log>=1.6.0 # Apache-2.0
oslo.messaging!=1.17.0,!=1.17.1,>=1.16.0 # Apache-2.0
oslo.serialization>=1.4.0 # Apache-2.0
oslo.service>=0.1.0 # Apache-2.0
oslo.utils>=1.9.0 # Apache-2.0

View File

@ -6,13 +6,12 @@ hacking<0.11,>=0.10.0
coverage>=3.6
discover
fixtures>=1.3.1
mock>=1.1;python_version!='2.6'
mock==1.0.1;python_version=='2.6'
mock>=1.2
python-subunit>=0.0.18
requests-mock>=0.6.0 # Apache-2.0
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
oslosphinx>=2.5.0 # Apache-2.0
oslo.concurrency>=2.1.0 # Apache-2.0
oslo.concurrency>=2.3.0 # Apache-2.0
testrepository>=0.0.18
testtools>=1.4.0
testscenarios>=0.4