aboutsummaryrefslogtreecommitdiffstats
path: root/storage/src/vespa/storage/config/stor-server.def
diff options
context:
space:
mode:
Diffstat (limited to 'storage/src/vespa/storage/config/stor-server.def')
-rw-r--r--storage/src/vespa/storage/config/stor-server.def8
1 files changed, 0 insertions, 8 deletions
diff --git a/storage/src/vespa/storage/config/stor-server.def b/storage/src/vespa/storage/config/stor-server.def
index 26b8450ab20..8cd204bcf9f 100644
--- a/storage/src/vespa/storage/config/stor-server.def
+++ b/storage/src/vespa/storage/config/stor-server.def
@@ -79,14 +79,6 @@ merge_throttling_memory_limit.auto_upper_bound_bytes long default=2147483648
## "source only", as merges do not cause mutations on such nodes.
resource_exhaustion_merge_back_pressure_duration_secs double default=30.0
-## If true, received merges that have already been accepted into the pending
-## merge window on at least one node will not be restricted by the configured
-## max_merge_queue_size limit. They will be allowed to enqueue regardless of
-## the current queue size. This avoids wasting the time spent being accepted
-## into merge windows, which would happen if the merge were to be bounced with
-## a busy-reply that would subsequently be unwound through the entire merge chain.
-disable_queue_limits_for_chained_merges bool default=true
-
## Whether the deadlock detector should be enabled or not. If disabled, it will
## still run, but it will never actually abort the process it is running in.
enable_dead_lock_detector bool default=false