summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-12-04 05:38:38 +0000
committerGerrit Code Review <review@openstack.org>2014-12-04 05:38:38 +0000
commita00e20c27f9dcc9cc03cbd74daf49e4438b3242e (patch)
treeba83d4215bea7400191109d374e661de1e3b0a56
parentd7ee2ff991e60ad54ff2125a397e9293ba966549 (diff)
parentd367c7cba421b6d87becde9a7b80eaa7220c93f1 (diff)
downloadneutron-a00e20c27f9dcc9cc03cbd74daf49e4438b3242e.tar.gz
Merge "Updated from global requirements" into stable/juno
-rw-r--r--requirements.txt18
-rw-r--r--test-requirements.txt2
2 files changed, 10 insertions, 10 deletions
diff --git a/requirements.txt b/requirements.txt
index 307d21517d..0cf1996bab 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -16,18 +16,18 @@ requests>=1.2.1,!=2.4.0
iso8601>=0.1.9
jsonrpclib
Jinja2
-keystonemiddleware>=1.0.0,<1.3
+keystonemiddleware>=1.0.0
netaddr>=0.7.12
-python-neutronclient>=2.3.6,<2.4
+python-neutronclient>=2.3.6,<3
SQLAlchemy>=0.8.4,<=0.8.99,>=0.9.7,<=0.9.99
WebOb>=1.2.3
-python-keystoneclient>=0.10.0,<0.12
+python-keystoneclient>=0.10.0
alembic>=0.6.4
six>=1.7.0
-stevedore>=1.0.0,<1.2 # Apache-2.0
-oslo.config>=1.4.0,<1.5 # Apache-2.0
-oslo.db>=1.0.0,<1.2 # Apache-2.0
-oslo.messaging>=1.4.0,<1.5
-oslo.rootwrap>=1.3.0,<1.4
+stevedore>=1.0.0 # Apache-2.0
+oslo.config>=1.4.0 # Apache-2.0
+oslo.db>=1.0.0 # Apache-2.0
+oslo.messaging>=1.4.0
+oslo.rootwrap>=1.3.0
-python-novaclient>=2.18.0,<2.21
+python-novaclient>=2.18.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 9bc6ad1ef0..160ed15108 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,7 +3,7 @@
# process, which may cause wedges in the gate later.
hacking>=0.9.2,<0.10
-cliff>=1.7.0,<1.9 # Apache-2.0
+cliff>=1.7.0 # Apache-2.0
coverage>=3.6
discover
fixtures>=0.3.14