Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2016-06-01 21:31:11 +00:00 committed by Gerrit Code Review
commit ec9f0fafc8
2 changed files with 3 additions and 3 deletions

View File

@ -4,7 +4,7 @@
Babel>=2.3.4 # BSD
eventlet!=0.18.3,>=0.18.2 # MIT
Flask<1.0,>=0.10 # BSD
Flask!=0.11,<1.0,>=0.10 # BSD
greenlet>=0.3.2 # MIT
Jinja2>=2.8 # BSD License (3 clause)
jsonschema!=2.5.0,<3.0.0,>=2.0.0 # MIT
@ -20,7 +20,7 @@ oslo.reports>=0.6.0 # Apache-2.0
oslo.rootwrap>=2.0.0 # Apache-2.0
oslo.serialization>=1.10.0 # Apache-2.0
oslo.service>=1.10.0 # Apache-2.0
oslo.utils>=3.5.0 # Apache-2.0
oslo.utils>=3.11.0 # Apache-2.0
Paste # MIT
PasteDeploy>=1.5.0 # MIT
pbr>=1.6 # Apache-2.0

View File

@ -5,7 +5,7 @@
# Hacking already pins down pep8, pyflakes and flake8
hacking<0.10,>=0.9.2
coverage>=3.6 # Apache-2.0
fixtures>=3.0.0 # Apache-2.0/BSD
fixtures<2.0,>=1.3.1 # Apache-2.0/BSD
mock>=2.0 # BSD
oslotest>=1.10.0 # Apache-2.0
oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0