Remove feature flag

2 files changed, 2 insertions, 6 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java
index 89993780869..dbff597b251 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java
@@ -1,7 +1,6 @@
 // Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.admin.clustercontroller;
 
-import com.yahoo.config.model.api.ModelContext;
 import com.yahoo.config.model.api.Reindexing;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
@@ -19,14 +18,12 @@ import java.util.Optional;
  */
 public class ClusterControllerContainerCluster extends ContainerCluster<ClusterControllerContainer> {
 
-    private final ModelContext.FeatureFlags featureFlags;
     private final ReindexingContext reindexingContext;
 
     public ClusterControllerContainerCluster(
             AbstractConfigProducer<?> parent, String subId, String name, DeployState deployState) {
         super(parent, subId, name, deployState, false);
         addDefaultHandlersWithVip();
-        this.featureFlags = deployState.featureFlags();
         this.reindexingContext = createReindexingContext(deployState);
         setJvmGCOptions(deployState.getProperties().jvmGCOptions(Optional.of(ClusterSpec.Type.admin)));
     }
@@ -40,8 +37,7 @@ public class ClusterControllerContainerCluster extends ContainerCluster<ClusterC
     public void getConfig(QrStartConfig.Builder builder) {
         super.getConfig(builder);
 
-        builder.jvm
-                .heapsize(featureFlags.clusterControllerMaxHeapSizeInMb());
+        builder.jvm.heapsize(128);
     }
 
     public ReindexingContext reindexingContext() { return reindexingContext; }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/StorageGroup.java b/config-model/src/main/java/com/yahoo/vespa/model/content/StorageGroup.java
index 44365bbbe27..c764b5ab449 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/StorageGroup.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/StorageGroup.java
@@ -54,7 +54,7 @@ public class StorageGroup {
      *
      * @param isHosted true if this is in a hosted setup
      * @param name the name of this group
-     * @param index the distribution-key index og this group
+     * @param index the distribution-key index of this group
      * @param partitions the distribution strategy to use to distribute content to subgroups or empty
      *        (meaning that the "*" distribution will be used) only if this is a leaf group
      *        (having nodes, not subgroups as children).