summaryrefslogtreecommitdiffstats
path: root/flags
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2022-01-27 07:22:12 +0100
committerGitHub <noreply@github.com>2022-01-27 07:22:12 +0100
commitd4081dfe4c40982d9657655ee33f0724ec2f2b21 (patch)
treed60a17f311b178510b1705d26bdb008c9d829e17 /flags
parentabec34cb3ec406046af784793a6f8ce107f807dd (diff)
Revert "Add feature flag for merge throttling policy"
Diffstat (limited to 'flags')
-rw-r--r--flags/src/main/java/com/yahoo/vespa/flags/Flags.java8
1 files changed, 0 insertions, 8 deletions
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
index 470bf9a0c1c..30a7c2cd600 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -357,14 +357,6 @@ public class Flags {
"Triggers restart, takes effect immediately",
ZONE_ID, APPLICATION_ID);
- public static final UnboundStringFlag MERGE_THROTTLING_POLICY = defineStringFlag(
- "merge-throttling-policy", "STATIC",
- List.of("vekterli"), "2022-01-25", "2022-05-01",
- "Sets the policy used for merge throttling on the content nodes. " +
- "Valid values: STATIC, DYNAMIC",
- "Takes effect at redeployment",
- ZONE_ID, APPLICATION_ID);
-
public static final UnboundBooleanFlag CHECK_CONFIG_CONVERGENCE_BEFORE_RESTARTING = defineFeatureFlag(
"check-config-convergence-before-restart", false,
List.of("hmusum"), "2022-01-16", "2022-02-16",