aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-17 14:11:53 +0000
committerGerrit Code Review <review@openstack.org>2017-07-17 14:11:53 +0000
commitcdd8e67985bcff40ba5b8181be8564077de5f10b (patch)
treeadceda112dbe8f8494832fd943460e99ba95fb7b
parent1d276136b0b0b791d91dd6f898d962a4f537f583 (diff)
parent26db5abb70c5a6ba6751e6da64709d49a88e329b (diff)
downloadkolla-cdd8e67985bcff40ba5b8181be8564077de5f10b.tar.gz
kolla-cdd8e67985bcff40ba5b8181be8564077de5f10b.zip
Merge "Updated from global requirements"
-rw-r--r--requirements.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/requirements.txt b/requirements.txt
index 0b26a1a17..1dababa85 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,5 +10,5 @@ GitPython>=1.0.1 # BSD License (3 clause)
six>=1.9.0 # MIT
oslo.config!=4.3.0,!=4.4.0,>=4.0.0 # Apache-2.0
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,>=16.0 # PSF/ZPL
+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
netaddr!=0.7.16,>=0.7.13 # BSD