summaryrefslogtreecommitdiffstats
path: root/storage/src
diff options
context:
space:
mode:
Diffstat (limited to 'storage/src')
-rw-r--r--storage/src/vespa/storage/config/stor-distributormanager.def2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/src/vespa/storage/config/stor-distributormanager.def b/storage/src/vespa/storage/config/stor-distributormanager.def
index 1d2d4babf74..0a858ba37c3 100644
--- a/storage/src/vespa/storage/config/stor-distributormanager.def
+++ b/storage/src/vespa/storage/config/stor-distributormanager.def
@@ -298,4 +298,4 @@ use_unordered_merge_chaining bool default=true
## cluster state bundle indicates that global merges are pending in the cluster, i.e.
## one or more nodes is in maintenance mode in the default bucket space but marked up in
## the global bucket space.
-inhibit_default_merges_when_global_merges_pending bool default=false
+inhibit_default_merges_when_global_merges_pending bool default=true