summaryrefslogtreecommitdiffstats
path: root/config-model-api
diff options
context:
space:
mode:
authorOlli Virtanen <ovirtanen@gmail.com>2019-03-29 12:36:04 +0100
committerGitHub <noreply@github.com>2019-03-29 12:36:04 +0100
commitb0f1e3055d4fc395105277076eb87306700136bb (patch)
tree279f9422cdd8d632889ba63be24d9595413c1b3f /config-model-api
parent748ad31c704fbd53ec45b659002a72564dbe2c04 (diff)
parent399a5dc9b483ca40690b940ecebb6fea96cdbc7d (diff)
Merge branch 'master' into ollivir/protobuf-ping-and-feature-flag
Diffstat (limited to 'config-model-api')
-rw-r--r--config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java3
1 files changed, 2 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 959e08d18fa..d0ec98e3297 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
@@ -56,7 +56,8 @@ public interface ModelContext {
boolean useFdispatchByDefault();
boolean dispatchWithProtobuf();
boolean useAdaptiveDispatch();
- boolean useSeparateServiceTypeForLogserverContainer();
+ // TODO: Remove when 7.33 is the oldest model in use
+ default boolean useSeparateServiceTypeForLogserverContainer() { return true; }
boolean enableMetricsProxyContainer();
}