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>

diff --git a/tools/cluster-merge b/tools/cluster-merge
index 89eb563..d006869 100755 (executable)
--- 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
 
         """