summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-04-23 11:57:34 +0000
committerGerrit Code Review <review@openstack.org>2015-04-23 11:57:34 +0000
commitdee609cb7976e9b3cc07c3d342a271c4a347f69f (patch)
tree21d3b1d4ad5e96cb32023d9440608c3054849819
parent109a7645eb131e4b6fa135bb886b7ccc319a2a35 (diff)
parentcbe5c9fbdfc983f806a8377cbf84b1773a5d70c1 (diff)
downloadironic-dee609cb7976e9b3cc07c3d342a271c4a347f69f.tar.gz
Merge "Updated from global requirements" into stable/kilo2015.1.0rc22015.1.0
-rw-r--r--requirements.txt10
-rw-r--r--test-requirements.txt2
2 files changed, 6 insertions, 6 deletions
diff --git a/requirements.txt b/requirements.txt
index 5233bb45a..a5e537470 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,10 +12,10 @@ sqlalchemy-migrate>=0.9.5
netaddr>=0.7.12
paramiko>=1.13.0
iso8601>=0.1.9
-python-neutronclient>=2.3.11,<3
-python-glanceclient>=0.15.0
-python-keystoneclient>=1.1.0
-python-swiftclient>=2.2.0
+python-neutronclient>=2.3.11,<2.5.0
+python-glanceclient>=0.15.0,<0.18.0
+python-keystoneclient>=1.1.0,<1.4.0
+python-swiftclient>=2.2.0,<2.5.0
stevedore>=1.3.0,<1.4.0 # Apache-2.0
pysendfile==2.0.0
websockify>=0.6.0,<0.7
@@ -34,7 +34,7 @@ six>=1.9.0
jsonpatch>=1.1
WSME>=0.6
Jinja2>=2.6 # BSD License (3 clause)
-keystonemiddleware>=1.5.0
+keystonemiddleware>=1.5.0,<1.6.0
oslo.messaging>=1.8.0,<1.9.0 # Apache-2.0
retrying>=1.2.3,!=1.3.0 # Apache-2.0
posix_ipc
diff --git a/test-requirements.txt b/test-requirements.txt
index 917126967..46ef6a56b 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -10,7 +10,7 @@ Babel>=1.3
MySQL-python
oslotest>=1.5.1,<1.6.0 # Apache-2.0
psycopg2
-python-ironicclient>=0.2.1
+python-ironicclient>=0.2.1,<0.6.0
python-subunit>=0.0.18
testrepository>=0.0.18
testtools>=0.9.36,!=1.2.0