summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-12-11 11:30:12 +0000
committerGerrit Code Review <review@openstack.org>2016-12-11 11:30:12 +0000
commit2912647d00f6ad4f1f2dc1f62357516cd18068c2 (patch)
tree061040c868c4f08bf77bfbc68d05805dbe2a8b28
parent9ceb24149110662d65469f0554036f7fe3e3d2c3 (diff)
parent1cb6e4299a1740761a9c11401fb39f0d68ee73aa (diff)
downloadpython-designateclient-2912647d00f6ad4f1f2dc1f62357516cd18068c2.tar.gz
Merge "Updated from global requirements"2.4.0
-rw-r--r--requirements.txt4
-rw-r--r--test-requirements.txt2
2 files changed, 3 insertions, 3 deletions
diff --git a/requirements.txt b/requirements.txt
index ef7bf44..abfb355 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,13 +1,13 @@
# The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-cliff>=2.2.0 # Apache-2.0
+cliff>=2.3.0 # Apache-2.0
jsonschema!=2.5.0,<3.0.0,>=2.0.0 # MIT
osc-lib>=1.2.0 # Apache-2.0
oslo.utils>=3.18.0 # Apache-2.0
pbr>=1.8 # Apache-2.0
keystoneauth1>=2.14.0 # Apache-2.0
-requests>=2.10.0 # Apache-2.0
+requests!=2.12.2,>=2.10.0 # Apache-2.0
six>=1.9.0 # MIT
stevedore>=1.17.1 # Apache-2.0
debtcollector>=1.2.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index d67f4e4..43e9e72 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -13,4 +13,4 @@ sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
testrepository>=0.0.18 # Apache-2.0/BSD
oslosphinx>=4.7.0 # Apache-2.0
reno>=1.8.0 # Apache-2.0
-tempest>=12.1.0 # Apache-2.0
+tempest>=12.1.0 # Apache-2.0