Merge branch 'master' into hmusum/add-flag-2

1 files changed, 7 insertions, 29 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 dd1ac4dd17f..59e97912bd1 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -282,14 +282,6 @@ public class Flags {
             "Takes effect on restart of Docker container",
             ZONE_ID, APPLICATION_ID);
 
-    public static final UnboundStringFlag PERSISTENCE_ASYNC_THROTTLING = defineStringFlag(
-            "persistence-async-throttling", "DYNAMIC",
-            List.of("vekterli"), "2022-01-12", "2022-08-01",
-            "Sets the throttling policy used for async persistence operations on the content nodes. " +
-            "Valid values: UNLIMITED, DYNAMIC",
-            "Triggers restart, takes effect immediately",
-            ZONE_ID, APPLICATION_ID);
-
     public static final UnboundStringFlag MERGE_THROTTLING_POLICY = defineStringFlag(
             "merge-throttling-policy", "STATIC",
             List.of("vekterli"), "2022-01-25", "2022-08-01",
@@ -355,13 +347,6 @@ public class Flags {
             "Takes effect at redeployment",
             ZONE_ID, APPLICATION_ID);
 
-    public static final UnboundBooleanFlag ENABLE_JDISC_PRESHUTDOWN_COMMAND = defineFeatureFlag(
-            "enable-jdisc-preshutdown-command", false,
-            List.of("bjorncs", "baldersheim"), "2022-01-31", "2022-05-31",
-            "Enable pre-shutdown command for jdisc",
-            "Takes effect at redeployment",
-            APPLICATION_ID, HOSTNAME, TENANT_ID);
-
     public static final UnboundBooleanFlag AVOID_RENAMING_SUMMARY_FEATURES = defineFeatureFlag(
             "avoid-renaming-summary-features", false,
             List.of("arnej"), "2022-01-15", "2023-12-31",
@@ -369,13 +354,6 @@ public class Flags {
             "Takes effect at redeployment",
             ZONE_ID, APPLICATION_ID);
 
-    public static final UnboundBooleanFlag MERGE_GROUPING_RESULT_IN_SEARCH_INVOKER = defineFeatureFlag(
-            "merge-grouping-result-in-search-invoker", false,
-            List.of("bjorncs", "baldersheim"), "2022-02-23", "2022-08-01",
-            "Merge grouping results incrementally in interleaved search invoker",
-            "Takes effect at redeployment",
-            APPLICATION_ID);
-
     public static final UnboundBooleanFlag EXPERIMENTAL_SD_PARSING = defineFeatureFlag(
             "experimental-sd-parsing", false,
             List.of("arnej"), "2022-03-04", "2022-12-31",
@@ -390,13 +368,6 @@ public class Flags {
             "Takes effect at redeployment",
             ZONE_ID, APPLICATION_ID);
 
-    public static final UnboundBooleanFlag USE_ZSTD_IN_FILE_DISTRIBUTION = defineFeatureFlag(
-            "use-zstd-in-file-distribution", false,
-            List.of("hmusum"), "2022-04-07", "2022-06-01",
-            "Whether to use zstd compression for data sent with file distribution",
-            "Takes effect immediately",
-            ZONE_ID, APPLICATION_ID);
-
     public static final UnboundStringFlag APPLICATION_FILES_WITH_UNKNOWN_EXTENSION = defineStringFlag(
             "fail-deployment-for-files-with-unknown-extension", "NOOP",
             List.of("hmusum"), "2022-04-27", "2022-05-27",
@@ -418,6 +389,13 @@ public class Flags {
             "Takes effect immediately",
             TENANT_ID);
 
+    public static final UnboundStringFlag PROVISION_IN_EXTERNAL_ACCOUNT = defineStringFlag(
+            "provision-in-external-account", "",
+            List.of("mpolden"), "2022-05-02", "2022-09-01",
+            "The 12-digit AWS account ID where resources belonging to an application should be provisioned",
+            "Takes effect on config server restart",
+            APPLICATION_ID);
+
     /** WARNING: public for testing: All flags should be defined in {@link Flags}. */
     public static UnboundBooleanFlag defineFeatureFlag(String flagId, boolean defaultValue, List<String> owners,
                                                        String createdAt, String expiresAt, String description,