summaryrefslogtreecommitdiffstats
path: root/flags
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@verizonmedia.com>2019-09-19 10:09:21 +0200
committerValerij Fredriksen <valerijf@verizonmedia.com>2019-09-19 10:09:21 +0200
commit28737735bd38c28610af46e39d0bfdea81f5dcb3 (patch)
tree219c4ed97be97013e040780b464235f33a82fbe1 /flags
parentfbd6bfdca987cb2c3121c5ea60c114107a05c7cb (diff)
Remove default-resources feature flag
Diffstat (limited to 'flags')
-rw-r--r--flags/src/main/java/com/yahoo/vespa/flags/Flags.java8
1 files changed, 0 insertions, 8 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 5893e473965..7087a58da21 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -2,7 +2,6 @@
package com.yahoo.vespa.flags;
import com.yahoo.vespa.defaults.Defaults;
-import com.yahoo.vespa.flags.custom.NodeResources;
import com.yahoo.vespa.flags.custom.PreprovisionCapacity;
import java.util.List;
@@ -10,7 +9,6 @@ import java.util.Optional;
import java.util.TreeMap;
import static com.yahoo.vespa.flags.FetchVector.Dimension.APPLICATION_ID;
-import static com.yahoo.vespa.flags.FetchVector.Dimension.CLUSTER_TYPE;
import static com.yahoo.vespa.flags.FetchVector.Dimension.HOSTNAME;
import static com.yahoo.vespa.flags.FetchVector.Dimension.NODE_TYPE;
@@ -136,12 +134,6 @@ public class Flags {
"Takes effect on next iteration of HostProvisionMaintainer.",
APPLICATION_ID);
- public static final UnboundJacksonFlag<NodeResources> DEFAULT_RESOURCES = defineJacksonFlag(
- "default-resources", null, NodeResources.class,
- "Node resources that will be used when not specified in services.xml",
- "Takes effect on next deployment",
- CLUSTER_TYPE);
-
public static final UnboundBooleanFlag USE_HTTPS_LOAD_BALANCER_UPSTREAM = defineFeatureFlag(
"use-https-load-balancer-upstream", false,
"Use https between load balancer and upstream containers",