Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2016-11-02 19:06:27 +00:00 committed by Gerrit Code Review
commit 17560e4042
2 changed files with 2 additions and 2 deletions

View File

@ -4,7 +4,7 @@
oslo.log>=3.11.0 # Apache-2.0
oslo.i18n>=2.1.0 # Apache-2.0
oslo.config>=3.14.0 # Apache-2.0
oslo.config!=3.18.0,>=3.14.0 # Apache-2.0
oslo.utils>=3.17.0 # Apache-2.0
enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD
cffi # MIT

View File

@ -10,4 +10,4 @@ fixtures>=3.0.0 # Apache-2.0/BSD
# These are needed for docs generation
oslosphinx>=4.7.0 # Apache-2.0
sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
reno>=1.8.0 # Apache2
reno>=1.8.0 # Apache-2.0