summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-04-21 15:06:06 +0000
committerGerrit Code Review <review@openstack.org>2016-04-21 15:06:06 +0000
commit59792c9df2a8979603a838fd017c12c835199b39 (patch)
tree7095c7b680d5d6740ab31bdee02a7956bff3b868
parent9df7e9cdcce3eee027a2f597e39c0ef870bc23e6 (diff)
parentfe8c47eba0fe2825a3694671eb47f4f47c3169d8 (diff)
downloadpython-openstackclient-59792c9df2a8979603a838fd017c12c835199b39.tar.gz
Merge "Updated from global requirements" into stable/liberty
-rw-r--r--requirements.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/requirements.txt b/requirements.txt
index 3637a9f4..03a3f1bf 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ pbr>=1.6
six>=1.9.0
Babel>=1.3
-cliff>=1.14.0 # Apache-2.0
+cliff!=1.16.0,!=1.17.0,>=1.14.0 # Apache-2.0
cliff-tablib>=1.0
os-client-config!=1.6.2,>=1.4.0
oslo.config>=2.3.0 # Apache-2.0
@@ -16,5 +16,5 @@ python-keystoneclient!=1.8.0,>=1.6.0
python-novaclient!=2.33.0,>=2.28.1
python-cinderclient>=1.3.1
python-neutronclient>=2.6.0
-requests!=2.8.0,>=2.5.2
+requests!=2.8.0,!=2.9.0,>=2.5.2
stevedore>=1.5.0 # Apache-2.0