Merge "Change urllib3 version to urllib3>=1.15.1"

This commit is contained in:
Jenkins 2016-05-17 13:37:40 +00:00 committed by Gerrit Code Review
commit c57e9de959

View File

@ -217,8 +217,7 @@ PyYAML>=3.1.0 # MIT
pywin32;sys_platform=='win32' # PSF
qpid-python;python_version=='2.7' # Apache-2.0
reno>=1.6.2 # Apache2
# NOTE(mriedem): requests 2.9.0 breaks IPv6 hostname parsing, see LP 1526413
requests>=2.8.1,!=2.9.0 # Apache-2.0
requests>=2.10.0 # Apache-2.0
requests-aws>=0.1.4 # BSD License (3 clause)
requests-kerberos>=0.6;python_version=='2.7' or python_version=='2.6' # MIT
requestsexceptions>=1.1.1 # Apache-2.0
@ -246,7 +245,7 @@ tooz>=1.28.0 # Apache-2.0
tosca-parser>=0.5.0 # Apache-2.0
tripleo-common>=2.0.0 # Apache-2.0
tripleo-image-elements # Apache-2.0
urllib3>=1.8.3 # MIT
urllib3>=1.15.1 # MIT
unicodecsv>=0.8.0;python_version<'3.0' # BSD
warlock>=1.0.1,<2 # Apache-2.0
weakrefmethod;python_version=='2.7' or python_version=='2.6' # PSF