diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-10-12 07:43:17 +0200 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2020-10-12 07:43:17 +0200 |
commit | 99c036b9b5acafa0c3ea667132aaef4939c6fcf9 (patch) | |
tree | 7bd08ac6ec1a0f2c5aa7339867cc649bbce88ba9 /flags | |
parent | f8cbda74df298dbe1c18dea3537251b5c0049a3a (diff) | |
parent | c3f03aa13bfa7e34ae342df51fcfa043d11ea4d3 (diff) |
Merge branch 'master' into hmusum/remove-unused-flag-7
Diffstat (limited to 'flags')
-rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 13 |
1 files changed, 6 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 a49daf94f01..8d27c723b89 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -325,13 +325,6 @@ public class Flags { APPLICATION_ID ); - public static final UnboundBooleanFlag WEIGHTED_DNS_PER_REGION = defineFeatureFlag( - "weighted-dns-per-region", true, - "Whether to create weighted DNS records per region in global endpoints", - "Takes effect on next deployment through controller", - APPLICATION_ID - ); - public static final UnboundBooleanFlag ONLY_PUBLIC_ACCESS = defineFeatureFlag( "enable-public-only", false, "Only access public hosts from container", @@ -391,6 +384,12 @@ public class Flags { "Whether application containers should use the new restapi handler implementation", "Takes effect on next internal redeployment"); + public static final UnboundBooleanFlag ALWAYS_ACQUIRE_PROVISION_LOCK = defineFeatureFlag( + "always-acquire-provision-lock", + false, + "Whether provision lock should always be taken when writing nodes", + "Takes effect on config server restart"); + /** WARNING: public for testing: All flags should be defined in {@link Flags}. */ public static UnboundBooleanFlag defineFeatureFlag(String flagId, boolean defaultValue, String description, String modificationEffect, FetchVector.Dimension... dimensions) { |