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 <>
Signed-off-by: default avatarIustin Pop <>
Reviewed-by: default avatarIustin Pop <>
parent c6a65efb
......@@ -386,7 +386,7 @@ class Merger(object):"Merging config")
def _OfflineClusterMerge():
def _OfflineClusterMerge(_):
"""Closure run when master daemons stopped
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment