Move MAX_TRIAL_TENANTS to PermanentFlags

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 f2c3e0cd25f..e469ec845d2 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(