Skip to content
Snippets Groups Projects
Commit caedacde authored by Stephen Shirley's avatar Stephen Shirley Committed by Iustin Pop
Browse files

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: default avatarStephen Shirley <diamond@google.com>
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parent c6a65efb
No related branches found
No related tags found
No related merge requests found
...@@ -386,7 +386,7 @@ class Merger(object): ...@@ -386,7 +386,7 @@ class Merger(object):
logging.info("Merging config") logging.info("Merging config")
self._FetchRemoteConfig() self._FetchRemoteConfig()
def _OfflineClusterMerge(): def _OfflineClusterMerge(_):
"""Closure run when master daemons stopped """Closure run when master daemons stopped
""" """
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment