summaryrefslogtreecommitdiffstats
path: root/config-provisioning
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@verizonmedia.com>2020-01-17 11:23:16 +0100
committerJon Bratseth <bratseth@verizonmedia.com>2020-01-17 11:23:16 +0100
commitc4341ca86ce65e7702d5358f41fbe0e678c9379d (patch)
tree9e7fffb5a6836d40a708a3e8ec6360c27377a092 /config-provisioning
parentdcc114ba5cbdb622cdc8fb4226c4fcecd9e085e1 (diff)
Refactor and hash
Diffstat (limited to 'config-provisioning')
-rw-r--r--config-provisioning/src/main/java/com/yahoo/config/provision/Capacity.java8
1 files changed, 1 insertions, 7 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Capacity.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Capacity.java
index 8738fd607c9..59d6ec8feb8 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/Capacity.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Capacity.java
@@ -66,7 +66,7 @@ public final class Capacity {
@Override
public String toString() {
- return nodeCount + " nodes " + (nodeResources.isPresent() ? "of flavor " + nodeResources.get() : "(default flavor)" );
+ return nodeCount + " nodes " + (nodeResources.isPresent() ? nodeResources.get() : "with default resources" );
}
/** Creates this from a desired node count: The request may be satisfied with a smaller number of nodes. */
@@ -87,12 +87,6 @@ public final class Capacity {
return new Capacity(nodeCount, resources, required, canFail, NodeType.tenant);
}
- // TODO: Remove after September 2019
- @Deprecated
- public static Capacity fromNodeCount(int nodeCount, Optional<String> flavor, boolean required, boolean canFail) {
- return new Capacity(nodeCount, flavor.map(NodeResources::fromLegacyName), required, canFail, NodeType.tenant);
- }
-
/** Creates this from a node type */
public static Capacity fromRequiredNodeType(NodeType type) {
return new Capacity(0, Optional.empty(), true, false, type);