diff options
| author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2020-01-16 16:27:35 +0100 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2020-01-16 16:27:35 +0100 |
| commit | 8b3dc39da9b25413d72eca88a78a70981017ec0e (patch) | |
| tree | 69d1904e6c8f918d9c0c09ddeadc3b8bffd441fa /flags | |
| parent | 3f16a26ec4a8893ab4d01b6c6e232c8585f25f2f (diff) | |
| parent | 9d3769aad649f631a652025d17325367aeaa455a (diff) | |
Merge branch 'master' into freva/fallback-to-node-repo-address
# 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 | 7 |
1 files changed, 7 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 729f5fe8707..265e829c97e 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -190,12 +190,19 @@ public class Flags { "Takes effect on config server restart", ZONE_ID); + public static final UnboundBooleanFlag USE_4443_UPSTREAM = defineFeatureFlag( + "use-4443-upstream", false, + "Use port 4443 for nginx upstream", + "Takes effect when routing container asks for new config", + APPLICATION_ID); + public static final UnboundBooleanFlag FAIL_STARTING_NODE_ON_IP_MISMATCH = defineFeatureFlag( "fail-starting-node-on-ip-mismatch", false, "Whether node-admin should refuse to start container when there is an IP mismatch between the DNS and node-repository", "Takes effect on next node creation (f.ex. node reboot or vespa version upgrade)", ZONE_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) { |