Merge branch 'master' of github.com:zalando/patroni into feature/custom-namespace

This commit is contained in:
Alexander Kukushkin
2015-10-23 15:58:42 +02:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -249,7 +249,7 @@ class Etcd(AbstractDCS):
@catch_etcd_errors
def cancel_initialization(self):
return self.retry(self.client.delete, self.initialize_path, prevValue=self._name)
return self.retry(self.client.delete, self.initialize_path)
def watch(self, timeout):
cluster = self.cluster
+1 -1
View File
@@ -271,7 +271,7 @@ class ZooKeeper(AbstractDCS):
def _cancel_initialization(self):
node = self.get_node(self.initialize_path)
if node and node[0] == self._name:
if node:
self.client.delete(self.initialize_path, version=node[1].version)
def cancel_initialization(self):