Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2015-07-23 22:06:05 +00:00 committed by Gerrit Code Review
commit f5abf217ef
2 changed files with 4 additions and 5 deletions

View File

@ -25,7 +25,7 @@ pyasn1
Babel>=1.3
iso8601>=0.1.9
jsonschema!=2.5.0,<3.0.0,>=2.0.0
python-cinderclient>=1.2.2
python-cinderclient>=1.3.1
python-keystoneclient>=1.6.0
python-neutronclient<3,>=2.3.11
python-glanceclient>=0.18.0
@ -43,7 +43,7 @@ oslo.serialization>=1.4.0 # Apache-2.0
oslo.utils>=1.9.0 # Apache-2.0
oslo.db>=1.12.0 # Apache-2.0
oslo.rootwrap>=2.0.0 # Apache-2.0
oslo.messaging>=1.16.0 # Apache-2.0
oslo.messaging!=1.17.0,!=1.17.1,>=1.16.0 # Apache-2.0
oslo.i18n>=1.5.0 # Apache-2.0
oslo.service>=0.1.0 # Apache-2.0
rfc3986>=0.2.0 # Apache-2.0

View File

@ -6,8 +6,7 @@ hacking<0.11,>=0.10.0
coverage>=3.6
discover
fixtures>=1.3.1
mock!=1.1.4,>=1.1;python_version!='2.6'
mock==1.0.1;python_version=='2.6'
mock>=1.2
mox3>=0.7.0
psycopg2
PyMySQL>=0.6.2 # MIT License
@ -25,4 +24,4 @@ tempest-lib>=0.6.1
bandit>=0.10.1
# vmwareapi driver specific dependencies
oslo.vmware>=0.13.1 # Apache-2.0
oslo.vmware>=1.16.0 # Apache-2.0