diff options
| author | Jon Bratseth <bratseth@oath.com> | 2020-04-24 11:53:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-24 11:53:47 +0200 |
| commit | 0bf2a952e1a0844089873817577235ab41697d2c (patch) | |
| tree | dad95fedbc2c4e70d07cd0c77cb023904015d785 /node-repository | |
| parent | 24eaf1642c012eb2f9f76a39102e87fb82874321 (diff) | |
| parent | 435783bc79fca6d2c8fd3e03ac0ce12ab0e23c28 (diff) | |
Merge pull request #13012 from vespa-engine/bratseth/remove-dead-code
Gc dead code
Diffstat (limited to 'node-repository')
2 files changed, 0 insertions, 18 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java index 5f1139fec2d..1d0ed788b41 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java @@ -73,18 +73,6 @@ public class NodeRepositoryProvisioner implements Provisioner { this.activator = new Activator(nodeRepository, loadBalancerProvisioner); } - - /** - * Returns a list of nodes in the prepared or active state, matching the given constraints. - * The nodes are ordered by increasing index number. - */ - @Deprecated // TODO: Remove after April 2020 - @Override - public List<HostSpec> prepare(ApplicationId application, ClusterSpec cluster, Capacity requestedCapacity, - int wantedGroups, ProvisionLogger logger) { - return prepare(application, cluster, requestedCapacity.withGroups(wantedGroups), logger); - } - /** * Returns a list of nodes in the prepared or active state, matching the given constraints. * The nodes are ordered by increasing index number. diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockProvisioner.java index 045d0cad1ad..12731e30f46 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockProvisioner.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockProvisioner.java @@ -20,12 +20,6 @@ import java.util.List; public class MockProvisioner implements Provisioner { @Override - @Deprecated // TODO: Remove after April 2020 - public List<HostSpec> prepare(ApplicationId applicationId, ClusterSpec cluster, Capacity capacity, int groups, ProvisionLogger logger) { - return Collections.emptyList(); - } - - @Override public List<HostSpec> prepare(ApplicationId applicationId, ClusterSpec cluster, Capacity capacity, ProvisionLogger logger) { return Collections.emptyList(); } |