summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Hellmann <doug@doughellmann.com>2015-05-27 12:22:43 -0400
committerMatt Riedemann <mriedem@us.ibm.com>2015-05-27 11:19:21 -0700
commitbd86d31d6ecda984e2f5863ce26f4d2b19a81665 (patch)
tree1ed318aa1491e128cfae190ae71c17e7f1f771a0
parent5edf2b3db33a42b646fe923580debff6b58a1122 (diff)
downloadtooz-stable/juno.tar.gz
Cap kazoo and zake from stable/juno global-requirementsjuno-eol0.12.1stable/juno
The latest version of zake blocks kazoo 2.1 which causes version conflicts in stable/juno jobs. Cap kazoo and zake using the values from global-requirements in stable/juno so that we can unblock stable/juno and stable/kilo (due to grenade jobs on kilo). Also updates .gitreview for stable/juno since this is the first commit to stable/juno for tooz. Partial-RTC: #1459322 Change-Id: Ib6f79cfcd18a758ce4b2a86f3ff323d533db4640
-rw-r--r--.gitreview1
-rw-r--r--requirements-py3.txt4
-rw-r--r--requirements.txt4
3 files changed, 5 insertions, 4 deletions
diff --git a/.gitreview b/.gitreview
index f3feb8a..07a38c2 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
host=review.openstack.org
port=29418
project=openstack/tooz.git
+defaultbranch=stable/juno
diff --git a/requirements-py3.txt b/requirements-py3.txt
index 5b14e3c..bee3396 100644
--- a/requirements-py3.txt
+++ b/requirements-py3.txt
@@ -3,9 +3,9 @@ Babel>=1.3
stevedore>=1.1.0
six>=1.7.0
iso8601
-kazoo>=1.3.1
+kazoo>=1.3.1,<=2.0
pymemcache>=1.2
-zake>=0.1.6
+zake>=0.1,<=0.1.7 # Apache-2.0
msgpack-python>=0.4.0
retrying>=1.2.3,!=1.3.0
oslo.utils>=1.0.0
diff --git a/requirements.txt b/requirements.txt
index 5f7325e..37176df 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,9 +3,9 @@ Babel>=1.3
stevedore>=1.1.0
six>=1.7.0
iso8601>=0.1.9
-kazoo>=1.3.1
+kazoo>=1.3.1,<=2.0
pymemcache>=1.2
-zake>=0.1
+zake>=0.1,<=0.1.7 # Apache-2.0
msgpack-python>=0.4.0
retrying>=1.2.3,!=1.3.0
futures>=2.1.6