summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-01-16 19:17:48 +0000
committerGerrit Code Review <review@openstack.org>2015-01-16 19:17:48 +0000
commit451a69fef02197807a656f3430cf1e8162261e88 (patch)
treee6bb225331d9523f89147c04a36a653b3621e896
parentfbf73003dbbe388aca294b8925b1b29d84834cd9 (diff)
parent08d9f4dd627b9327ef66adb3cb9ad56443c9d629 (diff)
downloadoslo-incubator-451a69fef02197807a656f3430cf1e8162261e88.tar.gz
Merge "Updated from global requirements" into stable/juno
-rw-r--r--requirements-py3.txt2
-rw-r--r--requirements.txt4
2 files changed, 3 insertions, 3 deletions
diff --git a/requirements-py3.txt b/requirements-py3.txt
index 2c2a6687..f6690e6e 100644
--- a/requirements-py3.txt
+++ b/requirements-py3.txt
@@ -22,6 +22,6 @@ requests>=1.2.1,!=2.4.0
Routes>=1.12.3,!=2.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
diff --git a/requirements.txt b/requirements.txt
index a6e9280c..157043ea 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ alembic>=0.6.4
anyjson>=0.3.3
argparse
Babel>=1.3
-eventlet>=0.15.1
+eventlet>=0.15.1,<0.16.0
greenlet>=0.3.2
iso8601>=0.1.9
Jinja2
@@ -25,6 +25,6 @@ requests>=1.2.1,!=2.4.0
Routes>=1.12.3,!=2.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