diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-02-11 12:18:25 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-11 12:18:25 +0100 |
commit | a598f72213715534b38ab20f26a5d8f87bd7267b (patch) | |
tree | f941b19173c6d6c18eb393fc2a883846909893fc | |
parent | 4a8eb0cf786aa2d8df3d104d42b68e8d3ee9e672 (diff) | |
parent | 78c22c8b8e4495ac08493a71bb1bd6b9c4c5778c (diff) |
Merge pull request #12143 from vespa-engine/hmusum/remove-feature-flag-2
Remove feature flag
-rw-r--r-- | configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java | 2 | ||||
-rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 6 |
2 files changed, 0 insertions, 8 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java index e0d4bfcf1d5..f75d11a145f 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java @@ -16,7 +16,6 @@ import com.yahoo.config.provision.RegionName; import com.yahoo.config.provision.TenantName; import com.yahoo.config.provision.Zone; import com.yahoo.vespa.config.ConfigPayload; -import com.yahoo.vespa.flags.Flags; import com.yahoo.vespa.flags.InMemoryFlagSource; import com.yahoo.vespa.model.VespaModel; import org.junit.Test; @@ -146,7 +145,6 @@ public class LbServicesProducerTest { @Test public void testRoutingConfigForTesterApplication() throws IOException, SAXException { - flagSource = new InMemoryFlagSource().withBooleanFlag(Flags.GENERATE_ROUTING_CONFIG_FOR_TESTER_APPLICATIONS.id(), false); assumeFalse(useGlobalServiceId); Map<TenantName, Set<ApplicationInfo>> testModel = createTestModel(new DeployState.Builder()); 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 babe804e6e4..b525da74b03 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -206,12 +206,6 @@ public class Flags { "Takes effect immediately", ZONE_ID, HOSTNAME); - public static final UnboundBooleanFlag GENERATE_ROUTING_CONFIG_FOR_TESTER_APPLICATIONS = defineFeatureFlag( - "generate-routing-config-for-tester-applications", false, - "Whether config server should generate routing config (lb-services) for tester applications", - "Takes effect on the next deployment of the routing (zone) application", - ZONE_ID); - public static final UnboundBooleanFlag USE_REFRESHED_ENDPOINT_CERTIFICATE = defineFeatureFlag( "use-refreshed-endpoint-certificate", false, "Whether an application should start using a newer certificate/key pair if available", |