diff options
author | Harald Musum <musum@verizonmedia.com> | 2019-03-28 15:26:37 +0100 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2019-03-28 15:26:37 +0100 |
commit | 3981f83325702f0ae124e8d9cbaa1bf76eda79b1 (patch) | |
tree | 1e5429ac5899e4c0c5258c9d8bf8f7a8e90221bc /flags/src | |
parent | 1ded1ef53b9b206770a765acbb097fb7c653463c (diff) | |
parent | 20137f39548cd2b2c5c5b826a0d8550e7c807e3e (diff) |
Merge branch 'master' into hmusum/use-separate-service-type-for-logserver-by-default
Diffstat (limited to 'flags/src')
-rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 12 |
1 files changed, 12 insertions, 0 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 e294aee02e7..2e0e15e8a12 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -113,6 +113,18 @@ public class Flags { "Takes effect at redeployment", APPLICATION_ID); + public static final UnboundBooleanFlag USE_LB_STATUS_FILE = defineFeatureFlag( + "use-lb-status-file", false, + "Serve status.html from the new path", + "Takes effect on restart of Docker container", + APPLICATION_ID, HOSTNAME); + + public static final UnboundBooleanFlag USE_HTTPS_LOAD_BALANCER_UPSTREAM = defineFeatureFlag( + "use-https-load-balancer-upstream", false, + "Use https between load balancer and upstream containers", + "Takes effect at redeployment", + APPLICATION_ID); + /** WARNING: public for testing: All flags should be defined in {@link Flags}. */ public static UnboundBooleanFlag defineFeatureFlag(String flagId, boolean defaultValue, String description, String modificationEffect, FetchVector.Dimension... dimensions) { |