From caedacdee99d2688462648e48534316bf2b34d03 Mon Sep 17 00:00:00 2001
From: Stephen Shirley <diamond@google.com>
Date: Thu, 27 Jan 2011 16:18:48 +0100
Subject: [PATCH] Add (unused) arg to _OfflineClusterMerge
cli._RunWhileClusterStoppedHelper.Call passes (self, *args) to functions
called via cli.RunWhileClusterStoppedHelper(). The code in cluster-merge
was broken by commit d8aab233.
Signed-off-by: Stephen Shirley <diamond@google.com>
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
tools/cluster-merge | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/cluster-merge b/tools/cluster-merge
index 89eb563e4..d006869ad 100755
--- a/tools/cluster-merge
+++ b/tools/cluster-merge
@@ -386,7 +386,7 @@ class Merger(object):
logging.info("Merging config")
self._FetchRemoteConfig()
- def _OfflineClusterMerge():
+ def _OfflineClusterMerge(_):
"""Closure run when master daemons stopped
"""
--
GitLab