diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-04-02 12:41:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-02 12:41:59 +0200 |
| commit | 448f5a09f05e0d17d58f9433d8fe78403f0ff78d (patch) | |
| tree | 8c6d387a9508986f4c44f0a4d6094a44abee67eb | |
| parent | fe46aea3b3802f5003754d9d6448d68a51f626bc (diff) | |
| parent | 74e5177cf27e49b395ae915e6775f11ddcf3c81d (diff) | |
Merge pull request #12804 from vespa-engine/revert-12794-revert-10931-bjorncs/tls
Reapply "Change default of 'tls-insecure-mixed-mode' to 'tls_client_tls_server' ""
| -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 36c7886de4c..862d83461fd 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); |