diff options
| author | Harald Musum <musum@verizonmedia.com> | 2021-11-04 15:58:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-04 15:58:01 +0100 |
| commit | 23a6aa13e9150a3858f85bf786a674dfcdcf3d89 (patch) | |
| tree | 68904f7c91315d5596aa7e071a8697faf86aab8f /flags | |
| parent | bcdbe18b722b5427cf8e9df74fc5f027c405f1d3 (diff) | |
| parent | 38bb53b6861dea39575da7547957c453d468bf34 (diff) | |
Merge pull request #19868 from vespa-engine/bjorncs/jdk-version-flag
Update description of 'jdk-version' feature flag
Diffstat (limited to 'flags')
| -rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 9 |
1 files changed, 6 insertions, 3 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 7ea31ea71a1..060a862988c 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -348,9 +348,12 @@ public class Flags { 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); + "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", + APPLICATION_ID, + HOSTNAME, + NODE_TYPE); /** WARNING: public for testing: All flags should be defined in {@link Flags}. */ public static UnboundBooleanFlag defineFeatureFlag(String flagId, boolean defaultValue, List<String> owners, |