summaryrefslogtreecommitdiffstats
path: root/flags/src
diff options
context:
space:
mode:
authorHarald Musum <musum@yahooinc.com>2021-10-25 14:52:25 +0200
committerHarald Musum <musum@yahooinc.com>2021-10-25 14:52:25 +0200
commitebf3650797c82e84d049c45952c85882221382ad (patch)
treebbc96ef0e31182ae29db4fb75ce668cce17c746d /flags/src
parent7b422788e130f1ddd093429524fea3f7ec24e517 (diff)
Move to Flags
Diffstat (limited to 'flags/src')
-rw-r--r--flags/src/main/java/com/yahoo/vespa/flags/Flags.java7
-rw-r--r--flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java6
2 files changed, 7 insertions, 6 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 4b7d05928c0..e7441acc203 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -376,6 +376,13 @@ public class Flags {
"Takes effect at redeploy",
ZONE_ID, APPLICATION_ID);
+ public static final UnboundStringFlag JDK_VERSION = defineStringFlag(
+ "jdk-version", "11",
+ List.of("hmusum"), "2021-10-25", "2021-11-25",
+ "JDK version to use inside containers",
+ "Takes effect on restart of Docker container",
+ APPLICATION_ID);
+
/** WARNING: public for testing: All flags should be defined in {@link Flags}. */
public static UnboundBooleanFlag defineFeatureFlag(String flagId, boolean defaultValue, List<String> owners,
String createdAt, String expiresAt, String description,
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 9f729bdbdfd..88e2393904e 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java
@@ -218,12 +218,6 @@ public class PermanentFlags {
"Takes effect immediately",
ZONE_ID, APPLICATION_ID);
- public static final UnboundStringFlag JDK_VERSION = defineStringFlag(
- "jdk-version", "11",
- "JDK version to use inside containers",
- "Takes effect on restart of Docker container",
- APPLICATION_ID);
-
private PermanentFlags() {}
private static UnboundBooleanFlag defineFeatureFlag(