summaryrefslogtreecommitdiffstats
path: root/config-model-api
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2020-04-21 11:20:08 +0200
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2020-04-21 11:20:08 +0200
commitf9db9ad8ad651dc55e2f292c365a79e4823a5a68 (patch)
treecc73b32d268a3acecce314461d2e83fa8635d51a /config-model-api
parent8e4f833cb513842ad1f5405b735a5e0e12df2320 (diff)
Remove feature flag for JDisc proxy protocol
Diffstat (limited to 'config-model-api')
-rw-r--r--config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java2
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 8ebb449ceda..c406fa80434 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
@@ -85,7 +85,7 @@ public interface ModelContext {
// TODO: Remove after April 2020
default boolean usePhraseSegmenting() { return false; }
- default String proxyProtocol() { return "https-only"; }
+ default String proxyProtocol() { return "https+proxy-protocol"; } // TODO bjorncs: Remove after end of May
default Optional<AthenzDomain> athenzDomain() { return Optional.empty(); }
// TODO(mpolden): Remove after May 2020