summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-05-17 07:05:23 +0000
committerGerrit Code Review <review@openstack.org>2016-05-17 07:05:24 +0000
commit142323a73e379ab657af4dab6fe8b36c6710f1db (patch)
tree6bda7cb43b7b3a04ba51570d0d6786112a30aade
parent3a773891785743fecf5c2f242200a8510904008b (diff)
parentd493c36984a8e85617aed2df5e8e6a5356236ff2 (diff)
downloadnova-142323a73e379ab657af4dab6fe8b36c6710f1db.tar.gz
Merge "Updated from global requirements" into stable/liberty
-rw-r--r--requirements.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/requirements.txt b/requirements.txt
index 796cf5fe6c..050091e82b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -26,7 +26,7 @@ Babel!=2.3.0,!=2.3.1,!=2.3.2,!=2.3.3,>=1.3 # BSD
iso8601>=0.1.9
jsonschema!=2.5.0,<3.0.0,>=2.0.0
python-cinderclient>=1.3.1
-python-keystoneclient!=1.8.0,>=1.6.0
+python-keystoneclient!=1.8.0,<3.0.0,>=1.6.0
python-neutronclient>=2.6.0
python-glanceclient>=0.18.0
requests!=2.8.0,!=2.9.0,>=2.5.2