Merge branch 'master' into freva/use-real-resources

# Conflicts:
#	flags/src/main/java/com/yahoo/vespa/flags/Flags.java

1 files changed, 7 insertions, 14 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 6cc5768e1bc..7e9c1be4047 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -103,14 +103,14 @@ public class Flags {
 
     public static final UnboundBooleanFlag USE_THREE_PHASE_UPDATES = defineFeatureFlag(
             "use-three-phase-updates", false,
-            List.of("vekterli"), "2020-12-02", "2021-09-01",
+            List.of("vekterli"), "2020-12-02", "2021-11-01",
             "Whether to enable the use of three-phase updates when bucket replicas are out of sync.",
             "Takes effect at redeployment",
             ZONE_ID, APPLICATION_ID);
 
     public static final UnboundBooleanFlag HIDE_SHARED_ROUTING_ENDPOINT = defineFeatureFlag(
             "hide-shared-routing-endpoint", false,
-            List.of("tokle", "bjormel"), "2020-12-02", "2021-09-01",
+            List.of("tokle", "bjormel"), "2020-12-02", "2021-11-01",
             "Whether the controller should hide shared routing layer endpoint",
             "Takes effect immediately",
             APPLICATION_ID
@@ -171,7 +171,7 @@ public class Flags {
 
     public static final UnboundIntFlag MAX_ACTIVATION_INHIBITED_OUT_OF_SYNC_GROUPS = defineIntFlag(
             "max-activation-inhibited-out-of-sync-groups", 0,
-            List.of("vekterli"), "2021-02-19", "2021-09-01",
+            List.of("vekterli"), "2021-02-19", "2021-11-01",
             "Allows replicas in up to N content groups to not be activated " +
             "for query visibility if they are out of sync with a majority of other replicas",
             "Takes effect at redeployment",
@@ -179,21 +179,21 @@ public class Flags {
 
     public static final UnboundIntFlag NUM_DISTRIBUTOR_STRIPES = defineIntFlag(
             "num-distributor-stripes", 0,
-            List.of("geirst", "vekterli"), "2021-04-20", "2021-09-01",
+            List.of("geirst", "vekterli"), "2021-04-20", "2021-11-01",
             "Specifies the number of stripes used by the distributor. When 0, legacy single stripe behavior is used.",
             "Takes effect after distributor restart",
             ZONE_ID, APPLICATION_ID);
 
     public static final UnboundIntFlag MAX_CONCURRENT_MERGES_PER_NODE = defineIntFlag(
             "max-concurrent-merges-per-node", 16,
-            List.of("balder", "vekterli"), "2021-06-06", "2021-09-01",
+            List.of("balder", "vekterli"), "2021-06-06", "2021-11-01",
             "Specifies max concurrent merges per content node.",
             "Takes effect at redeploy",
             ZONE_ID, APPLICATION_ID);
 
     public static final UnboundIntFlag MAX_MERGE_QUEUE_SIZE = defineIntFlag(
             "max-merge-queue-size", 1024,
-            List.of("balder", "vekterli"), "2021-06-06", "2021-09-01",
+            List.of("balder", "vekterli"), "2021-06-06", "2021-11-01",
             "Specifies max size of merge queue.",
             "Takes effect at redeploy",
             ZONE_ID, APPLICATION_ID);
@@ -227,7 +227,7 @@ public class Flags {
 
     public static final UnboundBooleanFlag REQUIRE_CONNECTIVITY_CHECK = defineFeatureFlag(
             "require-connectivity-check", true,
-            List.of("arnej"), "2021-06-03", "2021-09-01",
+            List.of("arnej"), "2021-06-03", "2021-12-01",
             "Require that config-sentinel connectivity check passes with good quality before starting services",
             "Takes effect on next restart",
             ZONE_ID, APPLICATION_ID);
@@ -239,13 +239,6 @@ public class Flags {
             "Takes effect on next deployment through controller",
             APPLICATION_ID);
 
-    public static final UnboundBooleanFlag DRY_RUN_ONNX_ON_SETUP = defineFeatureFlag(
-            "dry-run-onnx-on-setup", true,
-            List.of("baldersheim"), "2021-06-23", "2021-09-01",
-            "Whether to dry run onnx models on setup for better error checking",
-            "Takes effect on next internal redeployment",
-            APPLICATION_ID);
-
     public static final UnboundBooleanFlag USE_REAL_RESOURCES = defineFeatureFlag(
             "use-real-resources", false,
             List.of("freva"), "2021-09-08", "2021-10-01",