diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-02-09 16:43:11 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-09 16:43:11 +0100 |
commit | c95a8a1a82459df6a2d2eb5a785a82aa07e330f7 (patch) | |
tree | 5462c97ea50b949af81c4046152991dcece3d45f /config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java | |
parent | c019b75609b4cc0864f4106a79061a5b9cba77fd (diff) | |
parent | d5dc5cf116c60091684ac0efaf98716f9678b7ad (diff) |
Merge pull request #21123 from vespa-engine/geirst/remove-feature-flag-enable-feed-block-in-distributor
Remove feature flag "enable-feed-block-in-distributor".
Diffstat (limited to 'config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java')
-rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java index 0cf8b343b6a..638a66db03f 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java @@ -89,7 +89,7 @@ public interface ModelContext { @ModelFeatureFlag(owners = {"baldersheim"}) default int maxMergeQueueSize() { return 100; } @ModelFeatureFlag(owners = {"baldersheim"}) default boolean containerDumpHeapOnShutdownTimeout() { throw new UnsupportedOperationException("TODO specify default value"); } @ModelFeatureFlag(owners = {"baldersheim"}) default double containerShutdownTimeout() { throw new UnsupportedOperationException("TODO specify default value"); } - @ModelFeatureFlag(owners = {"geirst"}) default boolean enableFeedBlockInDistributor() { return true; } + @ModelFeatureFlag(owners = {"geirst"}, removeAfter = "7.541") default boolean enableFeedBlockInDistributor() { return true; } @ModelFeatureFlag(owners = {"bjorncs", "tokle"}) default List<String> allowedAthenzProxyIdentities() { return List.of(); } @ModelFeatureFlag(owners = {"vekterli"}) default int maxActivationInhibitedOutOfSyncGroups() { return 0; } @ModelFeatureFlag(owners = {"hmusum"}) default String jvmOmitStackTraceInFastThrowOption(ClusterSpec.Type type) { return ""; } |