summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-01-22 13:19:40 +0000
committerGerrit Code Review <review@openstack.org>2015-01-22 13:19:40 +0000
commitf06e26335bc1989e6037ec6ac507a7ba32f7cff9 (patch)
tree879a610c8848f07d5071ab05d03d385550c3c740
parent33e7fd8c62a3a5b9107410461edb9a87d09f549e (diff)
parent43d420bc43f79209fa2a510343d37d65133ec9f0 (diff)
downloadceilometer-f06e26335bc1989e6037ec6ac507a7ba32f7cff9.tar.gz
Merge "Updated from global requirements" into stable/juno
-rw-r--r--requirements-py3.txt4
-rw-r--r--requirements.txt4
2 files changed, 4 insertions, 4 deletions
diff --git a/requirements-py3.txt b/requirements-py3.txt
index a0e60302..669fc4b2 100644
--- a/requirements-py3.txt
+++ b/requirements-py3.txt
@@ -6,7 +6,7 @@ alembic>=0.6.4
anyjson>=0.3.3
argparse
croniter>=0.3.4 # MIT License
-eventlet>=0.15.1
+eventlet>=0.15.1,<0.16.0
iso8601>=0.1.9
jsonpath-rw>=1.2.0,<2.0
jsonschema>=2.0.0,<3.0.0
@@ -34,7 +34,7 @@ PyYAML>=3.1.0
requests>=1.2.1,!=2.4.0
six>=1.7.0
SQLAlchemy>=0.8.4,<=0.9.99,!=0.9.0,!=0.9.1,!=0.9.2,!=0.9.3,!=0.9.4,!=0.9.5,!=0.9.6
-sqlalchemy-migrate>=0.9.1,!=0.9.2
+sqlalchemy-migrate==0.9.1
stevedore>=1.0.0 # Apache-2.0
WebOb>=1.2.3
WSME>=0.6
diff --git a/requirements.txt b/requirements.txt
index 13a00178..645c5127 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ alembic>=0.6.4
anyjson>=0.3.3
argparse
croniter>=0.3.4 # MIT License
-eventlet>=0.15.1
+eventlet>=0.15.1,<0.16.0
happybase>=0.5,!=0.7
iso8601>=0.1.9
jsonpath-rw>=1.2.0,<2.0
@@ -40,7 +40,7 @@ PyYAML>=3.1.0
requests>=1.2.1,!=2.4.0
six>=1.7.0
SQLAlchemy>=0.8.4,<=0.9.99,!=0.9.0,!=0.9.1,!=0.9.2,!=0.9.3,!=0.9.4,!=0.9.5,!=0.9.6
-sqlalchemy-migrate>=0.9.1,!=0.9.2
+sqlalchemy-migrate==0.9.1
stevedore>=1.0.0 # Apache-2.0
tooz>=0.3 # Apache-2.0
WebOb>=1.2.3