Commit bb074298 authored by Guido Trotter's avatar Guido Trotter
Browse files

cluster-merge: consider file storage enable state

There's no point in checking whether the file storage dir in the two
clusters is the same if file storage is not even enabled
Signed-off-by: default avatarGuido Trotter <>
Reviewed-by: default avatarMichael Hanselmann <>
parent e3a19474
......@@ -341,11 +341,10 @@ class Merger(object):
# Generic checks
check_params = (
check_params = [
......@@ -355,7 +354,10 @@ class Merger(object):
for param_name in check_params:
my_param = getattr(my_cluster, param_name)
other_param = getattr(other_cluster, param_name)
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