diff options
| author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-03-28 15:23:02 +0100 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-03-28 15:23:02 +0100 |
| commit | f4ae34b9f439c77bba3b7446f199a537ddf1e888 (patch) | |
| tree | c00bdaf5096bf4024098c4a7695184f42b57b815 /flags | |
| parent | abe304c48a4f50885573dbc82c692f347676fca8 (diff) | |
| parent | b757de46187c87e11f9766c1bc23cd683a13e6a3 (diff) | |
Merge branch 'master' into freva/vip-status-file-feature-flag
# Conflicts:
# flags/src/main/java/com/yahoo/vespa/flags/Flags.java
Diffstat (limited to 'flags')
| -rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 6 |
1 files changed, 6 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 8876f2b5c80..513da4752ba 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -125,6 +125,12 @@ public class Flags { "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) { |