Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2016-08-11 03:30:01 +00:00 committed by Gerrit Code Review
commit 5d883b943c
2 changed files with 3 additions and 3 deletions

View File

@ -37,7 +37,7 @@ websockify>=0.8.0 # LGPLv3
oslo.cache>=1.5.0 # Apache-2.0
oslo.concurrency>=3.8.0 # Apache-2.0
oslo.config>=3.14.0 # Apache-2.0
oslo.context!=2.6.0,>=2.4.0 # Apache-2.0
oslo.context>=2.4.0 # Apache-2.0
oslo.log>=1.14.0 # Apache-2.0
oslo.reports>=0.6.0 # Apache-2.0
oslo.serialization>=1.10.0 # Apache-2.0
@ -54,7 +54,7 @@ oslo.middleware>=3.0.0 # Apache-2.0
psutil<2.0.0,>=1.1.1 # BSD
oslo.versionedobjects>=1.13.0 # Apache-2.0
os-brick>=1.3.0 # Apache-2.0
os-vif>=1.0.0 # Apache-2.0
os-vif>=1.1.0 # Apache-2.0
os-win>=0.2.3 # Apache-2.0
castellan>=0.4.0 # Apache-2.0
microversion-parse>=0.1.2 # Apache-2.0

View File

@ -14,7 +14,7 @@ python-ironicclient>=1.6.0 # Apache-2.0
python-subunit>=0.0.18 # Apache-2.0/BSD
requests-mock>=1.0 # Apache-2.0
sphinx!=1.3b1,<1.3,>=1.2.1 # BSD
os-api-ref>=0.1.0 # Apache-2.0
os-api-ref>=0.4.0 # Apache-2.0
oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
oslotest>=1.10.0 # Apache-2.0
os-testr>=0.7.0 # Apache-2.0