summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValerij Fredriksen <freva@users.noreply.github.com>2022-05-16 09:57:45 +0200
committerGitHub <noreply@github.com>2022-05-16 09:57:45 +0200
commit4eefbd147e96d1dab546d71f44f288d755c2648c (patch)
treeb30685ed135b35d1aef24b24360949320eab1f6d
parent212fc133b69654730a44d327ed8143682100b5d7 (diff)
parent58dd8a72cf1791486304219c410308f35d739d30 (diff)
Merge pull request #22614 from vespa-engine/hmusum/extend-feature-flag-expiry-date-11
Extend expiry dates
-rw-r--r--flags/src/main/java/com/yahoo/vespa/flags/Flags.java4
1 files changed, 2 insertions, 2 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 b195f721b22..76e2f6d0100 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -230,7 +230,7 @@ public class Flags {
public static final UnboundStringFlag JDK_VERSION = defineStringFlag(
"jdk-version", "11",
- List.of("hmusum"), "2021-10-25", "2022-05-15",
+ List.of("hmusum"), "2021-10-25", "2022-06-01",
"JDK version to use on host and inside containers. Note application-id dimension only applies for container, " +
"while hostname and node type applies for host.",
"Takes effect on restart for Docker container and on next host-admin tick for host",
@@ -269,7 +269,7 @@ public class Flags {
public static final UnboundBooleanFlag FAIL_DEPLOYMENT_WITH_INVALID_JVM_OPTIONS = defineFeatureFlag(
"fail-deployment-with-invalid-jvm-options", true,
- List.of("hmusum"), "2021-12-20", "2022-05-15",
+ List.of("hmusum"), "2021-12-20", "2022-06-01",
"Whether to fail deployments with invalid JVM options in services.xml",
"Takes effect at redeployment",
ZONE_ID, APPLICATION_ID);