summaryrefslogtreecommitdiffstats
path: root/flags
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 /flags
parent748ad31c704fbd53ec45b659002a72564dbe2c04 (diff)
parent399a5dc9b483ca40690b940ecebb6fea96cdbc7d (diff)
Merge branch 'master' into ollivir/protobuf-ping-and-feature-flag
Diffstat (limited to 'flags')
-rw-r--r--flags/src/main/java/com/yahoo/vespa/flags/Flags.java6
1 files changed, 0 insertions, 6 deletions
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
index dc50d237ab7..be564098121 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -113,12 +113,6 @@ public class Flags {
"Takes effect on next node agent tick (but does not clear existing failure reports)",
HOSTNAME);
- public static final UnboundBooleanFlag USE_SEPARATE_SERVICE_TYPE_FOR_LOGSERVER_CONTAINER = defineFeatureFlag(
- "use-separate-service-type-for-logserver-container", true,
- "Use separate service type for Logserver container, resulting in logserver container not being an application endpoint",
- "Takes effect at redeployment",
- APPLICATION_ID);
-
public static final UnboundBooleanFlag ENABLE_METRICS_PROXY_CONTAINER = defineFeatureFlag(
"enable-metrics-proxy-container", false,
"Start a container for metrics-proxy on every vespa node",