diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-06-23 12:22:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-23 12:22:26 +0200 |
| commit | 87f276475ffeb2635af6b0a237964c0ca896ee3b (patch) | |
| tree | 9241ea8a1d9162b4b87f3ee2cc2545e2a250b4f2 | |
| parent | fda49cb2e088c53200fe4153a8eb3cad725e8941 (diff) | |
| parent | 8e0ba2461c6e03838752f32ef8e8ebfe02fd4c44 (diff) | |
Merge pull request #18380 from vespa-engine/hmusum/revert-API-change
Add back method, still in use
| -rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java | 1 |
1 files changed, 1 insertions, 0 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 798ccee9ae7..6448302eb43 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 @@ -94,6 +94,7 @@ public interface ModelContext { @ModelFeatureFlag(owners = {"tokle"}) default boolean tenantIamRole() { return false; } @ModelFeatureFlag(owners = {"vekterli"}) default int maxActivationInhibitedOutOfSyncGroups() { return 0; } @ModelFeatureFlag(owners = {"hmusum"}) default String jvmOmitStackTraceInFastThrowOption(ClusterSpec.Type type) { return ""; } + @ModelFeatureFlag(owners = {"bjorncs", "jonmv"}, removeAfter = "7.424") default boolean enableJdiscHttp2() { return true; } @ModelFeatureFlag(owners = {"tokle", "bjorncs"}) default boolean enableCustomAclMapping() { return false; } @ModelFeatureFlag(owners = {"geirst", "vekterli"}) default int numDistributorStripes() { return 0; } @ModelFeatureFlag(owners = {"arnej"}) default boolean requireConnectivityCheck() { return false; } |