Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2015-05-01 15:43:39 +00:00 committed by Gerrit Code Review
commit ab5b737d4c
2 changed files with 16 additions and 16 deletions

View File

@ -6,7 +6,7 @@ pbr>=0.6,!=0.7,<1.0
SQLAlchemy>=0.9.7,<=0.9.99
boto>=2.32.1
decorator>=3.4.0
eventlet>=0.16.1,!=0.17.0
eventlet>=0.17.3
Jinja2>=2.6 # BSD License (3 clause)
keystonemiddleware>=1.5.0
lxml>=2.3
@ -26,18 +26,18 @@ python-cinderclient>=1.1.0
python-neutronclient>=2.3.11,<3
python-glanceclient>=0.15.0
six>=1.9.0
stevedore>=1.3.0,<1.4.0 # Apache-2.0
stevedore>=1.3.0 # Apache-2.0
websockify>=0.6.0,<0.7
oslo.concurrency>=1.8.0,<1.9.0 # Apache-2.0
oslo.config>=1.9.3,<1.10.0 # Apache-2.0
oslo.context>=0.2.0,<0.3.0 # Apache-2.0
oslo.log>=1.0.0,<1.1.0 # Apache-2.0
oslo.serialization>=1.4.0,<1.5.0 # Apache-2.0
oslo.utils>=1.4.0,<1.5.0 # Apache-2.0
oslo.db>=1.7.0,<1.8.0 # Apache-2.0
oslo.rootwrap>=1.6.0,<1.7.0 # Apache-2.0
oslo.messaging>=1.8.0,<1.9.0 # Apache-2.0
oslo.i18n>=1.5.0,<1.6.0 # Apache-2.0
oslo.concurrency>=1.8.0 # Apache-2.0
oslo.config>=1.11.0 # Apache-2.0
oslo.context>=0.2.0 # Apache-2.0
oslo.log>=1.0.0 # Apache-2.0
oslo.serialization>=1.4.0 # Apache-2.0
oslo.utils>=1.4.0 # Apache-2.0
oslo.db>=1.7.0 # Apache-2.0
oslo.rootwrap>=1.6.0 # Apache-2.0
oslo.messaging>=1.8.0 # Apache-2.0
oslo.i18n>=1.5.0 # Apache-2.0
rfc3986>=0.2.0 # Apache-2.0
oslo.middleware>=1.0.0,<1.1.0 # Apache-2.0
oslo.middleware>=1.0.0 # Apache-2.0
psutil>=1.1.1,<2.0.0

View File

@ -15,12 +15,12 @@ python-ironicclient>=0.2.1
python-subunit>=0.0.18
requests-mock>=0.6.0 # Apache-2.0
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
oslosphinx>=2.5.0,<2.6.0 # Apache-2.0
oslotest>=1.5.1,<1.6.0 # Apache-2.0
oslosphinx>=2.5.0 # Apache-2.0
oslotest>=1.5.1 # Apache-2.0
testrepository>=0.0.18
testtools>=0.9.36,!=1.2.0
tempest-lib>=0.4.0
# vmwareapi driver specific dependencies
suds>=0.4
oslo.vmware>=0.11.1,<0.12.0 # Apache-2.0
oslo.vmware>=0.11.1 # Apache-2.0