Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2016-01-08 03:24:47 +00:00 committed by Gerrit Code Review
commit c33bc9e37f

View File

@ -8,14 +8,14 @@
Babel>=1.3 Babel>=1.3
PrettyTable<0.8,>=0.7 PrettyTable<0.8,>=0.7
PyYAML>=3.1.0 PyYAML>=3.1.0
SQLAlchemy<1.1.0,>=0.9.9 SQLAlchemy<1.1.0,>=1.0.10
WSME>=0.8 WSME>=0.8
WebOb>=1.2.3 WebOb>=1.2.3
alembic>=0.8.0 alembic>=0.8.0
cliff>=1.15.0 # Apache-2.0 cliff>=1.15.0 # Apache-2.0
decorator>=3.4.0 decorator>=3.4.0
docker-py>=1.4.0 # Apache-2.0 docker-py>=1.4.0 # Apache-2.0
enum34;python_version=='2.7' or python_version=='2.6' enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3'
eventlet>=0.17.4 eventlet>=0.17.4
greenlet>=0.3.2 greenlet>=0.3.2
iso8601>=0.1.9 iso8601>=0.1.9
@ -23,7 +23,7 @@ jsonpatch>=1.1
keystonemiddleware>=4.0.0 keystonemiddleware>=4.0.0
netaddr!=0.7.16,>=0.7.12 netaddr!=0.7.16,>=0.7.12
oslo.concurrency>=2.3.0 # Apache-2.0 oslo.concurrency>=2.3.0 # Apache-2.0
oslo.config>=2.7.0 # Apache-2.0 oslo.config>=3.2.0 # Apache-2.0
oslo.context>=0.2.0 # Apache-2.0 oslo.context>=0.2.0 # Apache-2.0
oslo.db>=4.1.0 # Apache-2.0 oslo.db>=4.1.0 # Apache-2.0
oslo.i18n>=1.5.0 # Apache-2.0 oslo.i18n>=1.5.0 # Apache-2.0
@ -49,6 +49,6 @@ requests!=2.9.0,>=2.8.1
setuptools>=16.0 setuptools>=16.0
six>=1.9.0 six>=1.9.0
stevedore>=1.5.0 # Apache-2.0 stevedore>=1.5.0 # Apache-2.0
taskflow>=1.16.0 taskflow>=1.25.0
cryptography>=1.0 # Apache-2.0 cryptography>=1.0 # Apache-2.0
urllib3>=1.8.3 urllib3>=1.8.3