Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2015-12-02 00:23:05 +00:00 committed by Gerrit Code Review
commit 27fd04904d
2 changed files with 8 additions and 8 deletions

View File

@ -25,20 +25,20 @@ python-designateclient>=1.5.0
python-neutronclient>=2.6.0
iso8601>=0.1.9
jsonschema!=2.5.0,<3.0.0,>=2.0.0
Jinja2>=2.6 # BSD License (3 clause)
Jinja2>=2.8 # BSD License (3 clause)
pexpect!=3.3,>=3.1 # ISC License
oslo.config>=2.6.0 # Apache-2.0
oslo.config>=2.7.0 # Apache-2.0
oslo.context>=0.2.0 # Apache-2.0
oslo.i18n>=1.5.0 # Apache-2.0
oslo.middleware>=2.9.0 # Apache-2.0
oslo.middleware>=3.0.0 # Apache-2.0
oslo.serialization>=1.10.0 # Apache-2.0
oslo.service>=0.10.0 # Apache-2.0
oslo.utils!=2.6.0,>=2.4.0 # Apache-2.0
oslo.service>=0.12.0 # Apache-2.0
oslo.utils>=2.8.0 # Apache-2.0
oslo.concurrency>=2.3.0 # Apache-2.0
MySQL-python;python_version=='2.7'
Babel>=1.3
six>=1.9.0
stevedore>=1.5.0 # Apache-2.0
oslo.messaging!=2.8.0,>2.6.1 # Apache-2.0
osprofiler>=0.3.0 # Apache-2.0
osprofiler>=0.3.1 # Apache-2.0
oslo.log>=1.12.0 # Apache-2.0

View File

@ -4,8 +4,8 @@
# Hacking already pins down pep8, pyflakes and flake8
hacking<0.11,>=0.10.0
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
oslosphinx>=2.5.0 # Apache-2.0
reno>=0.1.1 # Apache2
oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
reno>=0.1.1 # Apache2
coverage>=3.6
nose