diff options
| author | Olli Virtanen <ovirtanen@gmail.com> | 2019-03-29 12:36:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-29 12:36:04 +0100 |
| commit | b0f1e3055d4fc395105277076eb87306700136bb (patch) | |
| tree | 279f9422cdd8d632889ba63be24d9595413c1b3f /configserver | |
| parent | 748ad31c704fbd53ec45b659002a72564dbe2c04 (diff) | |
| parent | 399a5dc9b483ca40690b940ecebb6fea96cdbc7d (diff) | |
Merge branch 'master' into ollivir/protobuf-ping-and-feature-flag
Diffstat (limited to 'configserver')
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java index 38886b4f656..0279d175488 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java @@ -132,7 +132,6 @@ public class ModelContextImpl implements ModelContext { private final boolean useFdispatchByDefault; private final boolean useAdaptiveDispatch; private final boolean dispatchWithProtobuf; - private final boolean useSeparateServiceTypeForLogserverContainer; private final boolean enableMetricsProxyContainer; public Properties(ApplicationId applicationId, @@ -166,8 +165,6 @@ public class ModelContextImpl implements ModelContext { .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value(); this.useAdaptiveDispatch = Flags.USE_ADAPTIVE_DISPATCH.bindTo(flagSource) .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value(); - this.useSeparateServiceTypeForLogserverContainer = Flags.USE_SEPARATE_SERVICE_TYPE_FOR_LOGSERVER_CONTAINER.bindTo(flagSource) - .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value(); this.enableMetricsProxyContainer = Flags.ENABLE_METRICS_PROXY_CONTAINER.bindTo(flagSource) .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value(); } @@ -222,9 +219,6 @@ public class ModelContextImpl implements ModelContext { public boolean useAdaptiveDispatch() { return useAdaptiveDispatch; } @Override - public boolean useSeparateServiceTypeForLogserverContainer() { return useSeparateServiceTypeForLogserverContainer; } - - @Override public boolean enableMetricsProxyContainer() { return enableMetricsProxyContainer; } } |