Merge pull request #26604 from vespa-engine/hmusum/cleanup-cluster-controller-2

Simplify and add todo about removing disk_distribution in Vespa 9

1 files changed, 0 insertions, 5 deletions

diff --git a/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java b/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java
index 0e8e755c236..4f9186a0569 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java
@@ -508,10 +508,6 @@ public class Distribution {
     }
 
     public static String getDefaultDistributionConfig(int redundancy, int nodeCount) {
-        return getDefaultDistributionConfig(redundancy, nodeCount, StorDistributionConfig.Disk_distribution.MODULO_BID);
-    }
-
-    public static String getDefaultDistributionConfig(int redundancy, int nodeCount, StorDistributionConfig.Disk_distribution.Enum diskDistribution) {
         StringBuilder sb = new StringBuilder();
         sb.append("raw:redundancy ").append(redundancy).append("\n")
           .append("group[1]\n")
@@ -522,7 +518,6 @@ public class Distribution {
         for (int i=0; i<nodeCount; ++i) {
             sb.append("group[0].nodes[").append(i).append("].index ").append(i).append("\n");
         }
-        sb.append("disk_distribution ").append(diskDistribution.toString()).append("\n");
         return sb.toString();
     }