diff options
| author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2019-03-04 13:36:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-04 13:36:55 +0100 |
| commit | 7a8607f637cb7411c3408ce7499b5f7616b54f2a (patch) | |
| tree | 7d48259f7a8e0e5f9db4b7cfa56c1d43d53dee2c | |
| parent | ac76b7090b26a82d5cdbc801a05196685b059f0c (diff) | |
| parent | d7178d97af5c93fcf21c462b0411e64f2ed0d18a (diff) | |
Merge pull request #8669 from vespa-engine/bjorncs/tls-insecure-mixed-mode
Bjorncs/tls insecure mixed mode
| -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 ac51e2d7ebc..7e093f2925c 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -72,7 +72,7 @@ public class Flags { HOSTNAME, APPLICATION_ID); public static final UnboundStringFlag TLS_INSECURE_MIXED_MODE = defineStringFlag( - "tls-insecure-mixed-mode", "plaintext_client_mixed_server", + "tls-insecure-mixed-mode", "tls_client_mixed_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); |