diff options
| author | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-09-30 00:11:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-30 00:11:57 +0200 |
| commit | c7f0af00e7f3da6458b09494be5de93adb83efa0 (patch) | |
| tree | 11fdef0e043f4cdba0f25889221195e03b0a4ba5 /flags | |
| parent | a3daaac29a529cab2765885abe918b9267a13b7a (diff) | |
| parent | 746774ebd25f099d6730b7a3aa60742b14a38af4 (diff) | |
Merge pull request #10803 from vespa-engine/hakonhall/make-filesnapshot-for-repeated-reads
Make FileSnapshot for repeated reads
Diffstat (limited to 'flags')
| -rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 6 |
1 files changed, 6 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 54c815b48a3..54531aeb0d7 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -80,6 +80,12 @@ public class Flags { "Takes effect on next node agent tick. Change is orchestrated, but does NOT require container restart", HOSTNAME, 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 Service Identity certificates.", + "Takes effect on next tick, but may get throttled due to orchestration.", + HOSTNAME); + 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']", |