From e1ab08db1fe5afab77e4c84e3b141669b56434f6 Mon Sep 17 00:00:00 2001 From: Stephen Shirley <diamond@google.com> Date: Thu, 27 Jan 2011 15:16:09 +0100 Subject: [PATCH] Open other clusters' config in foreign mode 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 d006869ad..d2ef90ec9 100755 --- a/tools/cluster-merge +++ b/tools/cluster-merge @@ -263,7 +263,7 @@ class Merger(object): fake_ec_id = 0 # Needs to be uniq over the whole config merge for data in self.merger_data: - other_config = config.ConfigWriter(data.config_path) + other_config = config.ConfigWriter(data.config_path, accept_foreign=True) for node in other_config.GetNodeList(): node_info = other_config.GetNodeInfo(node) -- GitLab