diff options
| author | Øyvind Grønnesby <oyving@verizonmedia.com> | 2021-04-06 14:25:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-06 14:25:10 +0200 |
| commit | 94ff9cd658dd23b90984257ec6245109d8d5b84b (patch) | |
| tree | 0b2c5a701e63a670cc87740c713bbc5defdfa920 /flags | |
| parent | 2dc0512d8eda7e851f5649ce0821edef17fc39af (diff) | |
| parent | 6125bfb741db287f770bb883a54e0c031d02b5f2 (diff) | |
Merge pull request #17277 from vespa-engine/ogronnesby/max-trial-tenants
Move MAX_TRIAL_TENANTS to PermanentFlags
Diffstat (limited to 'flags')
| -rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 7 | ||||
| -rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java | 6 |
2 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 7c3fb097e2b..13a8a50b9a8 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -137,13 +137,6 @@ public class Flags { "Takes effect immediately on new hosts, on next redeploy for applications", TENANT_ID); - public static final UnboundIntFlag MAX_TRIAL_TENANTS = defineIntFlag( - "max-trial-tenants", -1, - List.of("ogronnesby"), "2020-12-03", "2021-04-01", - "The maximum nr. of tenants with trial plan, -1 is unlimited", - "Takes effect immediately" - ); - public static final UnboundBooleanFlag HIDE_SHARED_ROUTING_ENDPOINT = defineFeatureFlag( "hide-shared-routing-endpoint", false, List.of("tokle"), "2020-12-02", "2021-06-01", diff --git a/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java b/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java index 251d8f67126..ad096a20786 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java @@ -145,6 +145,12 @@ public class PermanentFlags { "takes effect on JVM restart", NODE_TYPE, APPLICATION_ID); + public static final UnboundIntFlag MAX_TRIAL_TENANTS = defineIntFlag( + "max-trial-tenants", -1, + "The maximum nr. of tenants with trial plan, -1 is unlimited", + "Takes effect immediately" + ); + private PermanentFlags() {} private static UnboundBooleanFlag defineFeatureFlag( |