summaryrefslogtreecommitdiffstats
path: root/flags
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2021-07-16 08:38:32 +0200
committerHarald Musum <musum@verizonmedia.com>2021-07-16 08:38:32 +0200
commit3896b1f35f445b0b4859c6f93b01871936c09542 (patch)
tree549d5b4cac16a2143dccdadebf9398cd0a4aa493 /flags
parent4c992d9f26189abd36796c342606c3cea4c990ea (diff)
parent073c5be0df2970bd4e6d926a56d14657965992d3 (diff)
Merge branch 'master' into hmusum/remove-flag-2
Diffstat (limited to 'flags')
-rw-r--r--flags/src/main/java/com/yahoo/vespa/flags/Flags.java7
1 files changed, 0 insertions, 7 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 63e39d8b398..4a470b7e2d2 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -150,13 +150,6 @@ public class Flags {
"Takes effect at redeployment",
ZONE_ID, APPLICATION_ID);
- public static final UnboundIntFlag METRICS_PROXY_MAX_HEAP_SIZE_IN_MB = defineIntFlag(
- "metrics-proxy-max-heap-size-in-mb", 256,
- List.of("hmusum"), "2021-03-01", "2021-07-15",
- "JVM max heap size for metrics proxy in Mb",
- "Takes effect when restarting metrics proxy",
- CLUSTER_TYPE);
-
public static final UnboundStringFlag DEDICATED_CLUSTER_CONTROLLER_FLAVOR = defineStringFlag(
"dedicated-cluster-controller-flavor", "", List.of("jonmv"), "2021-02-25", "2021-08-25",
"Flavor as <vpu>-<memgb>-<diskgb> to use for dedicated cluster controller nodes",