Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2014-10-12 21:52:07 +00:00 committed by Gerrit Code Review
commit 36212c43d8
2 changed files with 4 additions and 4 deletions

View File

@ -7,10 +7,10 @@ oslo.i18n>=1.0.0 # Apache-2.0
oslo.utils>=1.0.0 # Apache-2.0 oslo.utils>=1.0.0 # Apache-2.0
pbr>=0.6,!=0.7,<1.0 pbr>=0.6,!=0.7,<1.0
python-glanceclient>=0.14.0 python-glanceclient>=0.14.0
python-keystoneclient>=0.10.0 python-keystoneclient>=0.11.1
python-novaclient>=2.18.0 python-novaclient>=2.18.0
python-cinderclient>=1.1.0 python-cinderclient>=1.1.0
python-neutronclient>=2.3.6,<3 python-neutronclient>=2.3.6,<3
requests>=1.2.1,!=2.4.0 requests>=2.2.0,!=2.4.0
six>=1.7.0 six>=1.7.0
stevedore>=1.0.0 stevedore>=1.0.0 # Apache-2.0

View File

@ -9,7 +9,7 @@ fixtures>=0.3.14
mock>=1.0 mock>=1.0
oslosphinx>=2.2.0 # Apache-2.0 oslosphinx>=2.2.0 # Apache-2.0
requests-mock>=0.4.0 # Apache-2.0 requests-mock>=0.4.0 # Apache-2.0
sphinx>=1.1.2,!=1.2.0,<1.3 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
testrepository>=0.0.18 testrepository>=0.0.18
testtools>=0.9.34 testtools>=0.9.34
WebOb>=1.2.3 WebOb>=1.2.3