diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2020-01-28 14:32:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-28 14:32:52 +0100 |
| commit | 489431b1e67cbd0b6ee9cf2202392d2584704e40 (patch) | |
| tree | 82056822c53dcec54eda2c615026747c570b4cb3 | |
| parent | b0b512c502d836375f75522008ec4fb3fe6703f9 (diff) | |
| parent | 0aeb82223e26fb3919aee4250a2a7d6683b49c68 (diff) | |
Merge pull request #11978 from vespa-engine/hakonhall/remove-unused-include-sis-in-truststore-flag-definition
Remove unused include-sis-in-truststore flag definition
| -rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 11 |
1 files changed, 0 insertions, 11 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 fb2da49a194..c3d107df1ca 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -90,17 +90,6 @@ public class Flags { "Takes effect on the next deployment of the application", APPLICATION_ID); - public static final UnboundBooleanFlag INCLUDE_SIS_IN_TRUSTSTORE = defineFeatureFlag( - "include-sis-in-truststore", false, - "Whether to use the trust store backed by Athenz and (in public) Service Identity certificates in " + - "host-admin and/or Docker containers", - "Takes effect on restart of host-admin (for host-admin), and restart of Docker container.", - // For host-admin, HOSTNAME and NODE_TYPE is available - // For Docker containers, HOSTNAME and APPLICATION_ID is available - // WARNING: Having different sets of dimensions is DISCOURAGED in general, but needed for here since - // trust store for host-admin is determined before having access to application ID from node repo. - HOSTNAME, NODE_TYPE, APPLICATION_ID); - public static final UnboundStringFlag TLS_INSECURE_MIXED_MODE = defineStringFlag( "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']", |