Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2016-10-06 16:51:54 +00:00 committed by Gerrit Code Review
commit 2aee1ba19e
2 changed files with 8 additions and 8 deletions

View File

@ -6,13 +6,13 @@
# ascii betical order.
Babel>=2.3.4 # BSD
PrettyTable<0.8,>=0.7 # BSD
PyYAML>=3.1.0 # MIT
PrettyTable<0.8,>=0.7.1 # BSD
PyYAML>=3.10.0 # MIT
SQLAlchemy<1.1.0,>=1.0.10 # MIT
WSME>=0.8 # MIT
WebOb>=1.2.3 # MIT
alembic>=0.8.4 # MIT
cliff!=1.16.0,!=1.17.0,>=1.15.0 # Apache-2.0
cliff>=2.2.0 # Apache-2.0
decorator>=3.4.0 # BSD
docker-py<1.8.0,>=1.6.0 # Apache-2.0
enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD
@ -31,7 +31,7 @@ oslo.i18n>=2.1.0 # Apache-2.0
oslo.log>=3.11.0 # Apache-2.0
oslo.messaging>=5.2.0 # Apache-2.0
oslo.middleware>=3.0.0 # Apache-2.0
oslo.policy>=1.9.0 # Apache-2.0
oslo.policy>=1.14.0 # Apache-2.0
oslo.serialization>=1.10.0 # Apache-2.0
oslo.service>=1.10.0 # Apache-2.0
oslo.utils>=3.16.0 # Apache-2.0
@ -39,7 +39,7 @@ oslo.versionedobjects>=1.13.0 # Apache-2.0
oslo.reports>=0.6.0 # Apache-2.0
paramiko>=2.0 # LGPLv2.1+
pbr>=1.6 # Apache-2.0
pecan!=1.0.2,!=1.0.3,!=1.0.4,>=1.0.0 # BSD
pecan!=1.0.2,!=1.0.3,!=1.0.4,!=1.2,>=1.0.0 # BSD
pycadf!=2.0.0,>=1.1.0 # Apache-2.0
python-barbicanclient>=4.0.0 # Apache-2.0
python-glanceclient>=2.5.0 # Apache-2.0

View File

@ -12,13 +12,13 @@ fixtures>=3.0.0 # Apache-2.0/BSD
hacking<0.11,>=0.10.0 # Apache-2.0
mock>=2.0 # BSD
openstackdocstheme>=1.5.0 # Apache-2.0
oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
oslosphinx>=4.7.0 # Apache-2.0
oslotest>=1.10.0 # Apache-2.0
os-api-ref>=1.0.0 # Apache-2.0
os-testr>=0.7.0 # Apache-2.0
os-testr>=0.8.0 # Apache-2.0
python-subunit>=0.0.18 # Apache-2.0/BSD
pytz>=2013.6 # MIT
sphinx!=1.3b1,<1.3,>=1.2.1 # BSD
sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
testrepository>=0.0.18 # Apache-2.0/BSD
testscenarios>=0.4 # Apache-2.0/BSD
testtools>=1.4.0 # MIT