summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHÃ¥kon Hallingstad <hakon@verizonmedia.com>2021-10-01 15:03:43 +0200
committerGitHub <noreply@github.com>2021-10-01 15:03:43 +0200
commit999556d9c93331b169f00ee28fd5095eae98c362 (patch)
treea39490807f61e562a046bcd67ca9b9450d58e7cf
parent0f3a8f3e24b2bbd932ee112615ed8a0798a37175 (diff)
parent29a3df5f616c650cbc8aa294d9ec39bdf24f661d (diff)
Merge pull request #19397 from vespa-engine/hakonhall/extend-expiry-of-encryption-flags
Extend expiry of encryption flags
-rw-r--r--flags/src/main/java/com/yahoo/vespa/flags/Flags.java4
1 files changed, 2 insertions, 2 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 953caaf9753..249d193ebf1 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -200,7 +200,7 @@ public class Flags {
public static final UnboundIntFlag MAX_ENCRYPTING_HOSTS = defineIntFlag(
"max-encrypting-hosts", 0,
- List.of("mpolden", "hakonhall"), "2021-05-27", "2021-10-01",
+ List.of("mpolden", "hakonhall"), "2021-05-27", "2021-11-01",
"The maximum number of hosts allowed to encrypt their disk concurrently",
"Takes effect on next run of HostEncrypter, but any currently encrypting hosts will not be cancelled when reducing the limit");
@@ -213,7 +213,7 @@ public class Flags {
public static final UnboundListFlag<String> DEFER_APPLICATION_ENCRYPTION = defineListFlag(
"defer-application-encryption", List.of(), String.class,
- List.of("mpolden", "hakonhall"), "2021-06-23", "2021-10-01",
+ List.of("mpolden", "hakonhall"), "2021-06-23", "2021-11-01",
"List of applications where encryption of their host should be deferred",
"Takes effect on next run of HostEncrypter");