diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-04-01 14:55:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-01 14:55:43 +0200 |
| commit | 9758bb9976df24095c42fe6646c4e013a172bfab (patch) | |
| tree | 21108e158cc4af826ea86f9395145d69b62f7eb7 /flags | |
| parent | 047364764c7ef7d5d6023b6f4d298947a27cf823 (diff) | |
| parent | f769d8a25c883d81ab3abfb873fe789a6deb9dc7 (diff) | |
Merge pull request #10931 from vespa-engine/bjorncs/tls
Change default of 'tls-insecure-mixed-mode' to 'tls_client_tls_server'
Diffstat (limited to 'flags')
| -rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 2 |
1 files changed, 1 insertions, 1 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 559bed4f846..ad49fc6d50a 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -110,7 +110,7 @@ public class Flags { APPLICATION_ID); public static final UnboundStringFlag TLS_INSECURE_MIXED_MODE = defineStringFlag( - "tls-insecure-mixed-mode", "tls_client_mixed_server", + "tls-insecure-mixed-mode", "tls_client_tls_server", "TLS insecure mixed mode. Allowed values: ['plaintext_client_mixed_server', 'tls_client_mixed_server', 'tls_client_tls_server']", "Takes effect on restart of Docker container", NODE_TYPE, APPLICATION_ID, HOSTNAME); |