Merge "Updated from global requirements"

This commit is contained in:
Jenkins
2015-07-11 04:29:56 +00:00
committed by Gerrit Code Review
2 changed files with 3 additions and 2 deletions

View File

@@ -7,7 +7,7 @@ pbr<2.0,>=0.11
futurist>=0.1.1 # Apache-2.0
oslo.config>=1.11.0 # Apache-2.0
oslo.context>=0.2.0 # Apache-2.0
oslo.log>=1.2.0 # Apache-2.0
oslo.log>=1.2.0 # Apache-2.0
oslo.utils>=1.6.0 # Apache-2.0
oslo.serialization>=1.4.0 # Apache-2.0
oslo.service>=0.1.0 # Apache-2.0

View File

@@ -7,7 +7,8 @@ hacking<0.11,>=0.10.0
discover
fixtures>=1.3.1
mock>=1.0
mock>=1.0;python_version!='2.6'
mock==1.0.1;python_version=='2.6'
mox3>=0.7.0
python-subunit>=0.0.18
testrepository>=0.0.18