summaryrefslogtreecommitdiffstats
path: root/config-model-api
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2022-05-09 14:50:27 +0200
committerGitHub <noreply@github.com>2022-05-09 14:50:27 +0200
commit183ef58a4c6972a8f222778e4c0ccb4615e1a9ef (patch)
treed594389241627f863ee14345e8a526509ea64f10 /config-model-api
parent8d51c1b7eb0a8a11def50b38b0cc4f41d5ce4323 (diff)
parent9ec88159ecb981d91997a35b059edb28e7802cb4 (diff)
Merge pull request #22513 from vespa-engine/mortent/proxy-protocol-disable-mixed-mode
Flag to control proxy protocol mixed mode
Diffstat (limited to 'config-model-api')
-rw-r--r--config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java1
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 d091abc3781..9c33045e921 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
@@ -113,6 +113,7 @@ public interface ModelContext {
@ModelFeatureFlag(owners = {"arnej"}) default boolean experimentalSdParsing() { return false; }
@ModelFeatureFlag(owners = {"baldersheim"}) default boolean enableBitVectors() { return false; }
@ModelFeatureFlag(owners = {"hmusum"}) default Architecture adminClusterArchitecture() { return Architecture.getDefault(); }
+ @ModelFeatureFlag(owners = {"tokle"}) default boolean enableProxyProtocolMixedMode() { return true; }
}
/** Warning: As elsewhere in this package, do not make backwards incompatible changes that will break old config models! */