diff options
Diffstat (limited to 'config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java')
| -rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java index 7be4f7809d5..113b32fc571 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java @@ -221,8 +221,7 @@ public class NodeResources { diskGb - other.diskGb, bandwidthGbps - other.bandwidthGbps, this.diskSpeed.combineWith(other.diskSpeed), - this.storageType.combineWith(other.storageType), - this.architecture.combineWith(other.architecture)); + this.storageType.combineWith(other.storageType)); } public NodeResources add(NodeResources other) { @@ -234,8 +233,7 @@ public class NodeResources { diskGb + other.diskGb, bandwidthGbps + other.bandwidthGbps, this.diskSpeed.combineWith(other.diskSpeed), - this.storageType.combineWith(other.storageType), - this.architecture.combineWith(other.architecture)); + this.storageType.combineWith(other.storageType)); } private boolean isInterchangeableWith(NodeResources other) { @@ -245,8 +243,6 @@ public class NodeResources { return false; if (this.storageType != StorageType.any && other.storageType != StorageType.any && this.storageType != other.storageType) return false; - if (this.architecture != other.architecture) - return false; return true; } |