Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2017-07-27 07:57:30 +00:00 committed by Gerrit Code Review
commit 960c8de70b

@ -10,4 +10,4 @@ oslo.utils>=3.20.0 # Apache-2.0
setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,!=36.2.0,>=16.0 # PSF/ZPL
PyYAML>=3.10.0 # MIT
netaddr!=0.7.16,>=0.7.13 # BSD
cryptography>=1.6 # BSD/Apache-2.0
cryptography!=2.0,>=1.6 # BSD/Apache-2.0