Merge "Updated from global requirements"

This commit is contained in:
Zuul 2018-03-09 10:30:13 +00:00 committed by Gerrit Code Review
commit 64cfa8ff43
1 changed files with 2 additions and 2 deletions

View File

@ -34,7 +34,7 @@ python-glanceclient>=2.8.0 # Apache-2.0
python-novaclient>=9.1.0 # Apache-2.0
pyOpenSSL>=16.2.0 # Apache-2.0
WSME>=0.8.0 # MIT
Jinja2!=2.9.0,!=2.9.1,!=2.9.2,!=2.9.3,!=2.9.4,>=2.8 # BSD License (3 clause)
Jinja2>=2.10 # BSD License (3 clause)
taskflow>=2.16.0 # Apache-2.0
diskimage-builder!=1.6.0,!=1.7.0,!=1.7.1,>=1.1.2 # Apache-2.0
futures>=3.0.0;python_version=='2.7' or python_version=='2.6' # BSD
@ -43,7 +43,7 @@ castellan>=0.16.0 # Apache-2.0
#for the amphora api
Flask!=0.11,<1.0,>=0.10 # BSD
netifaces>=0.10.4 # MIT
ipaddress>=1.0.16;python_version<'3.3' # PSF
ipaddress>=1.0.17;python_version<'3.3' # PSF
cryptography!=2.0,>=1.9 # BSD/Apache-2.0
pyroute2>=0.4.21;sys_platform!='win32' # Apache-2.0 (+ dual licensed GPL2)
gunicorn>=19.0.0 # MIT