diff options
| author | Martin Polden <mpolden@mpolden.no> | 2020-01-10 10:55:10 +0100 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2020-01-10 10:57:16 +0100 |
| commit | 5d1c1644b2afdafccaa3c7abafa415b7c028daab (patch) | |
| tree | 3cd4b39b3310f90f0ad4ff1f74c42fc67c98b6e4 /node-repository | |
| parent | 0e3637dfdd8c7301cefe986c889971efad1f3781 (diff) | |
Simplify
Diffstat (limited to 'node-repository')
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java index a57b9d359f0..f23a3e9b823 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java @@ -213,8 +213,7 @@ class NodeAllocation { if (node.state() != Node.State.active) return false; if (! node.allocation().get().membership().cluster().group().equals(cluster.group())) return false; - return cluster.type() == ClusterSpec.Type.content || - cluster.type() == ClusterSpec.Type.combined || + return cluster.type().isContent() || (cluster.type() == ClusterSpec.Type.container && !hasCompatibleFlavor(node)); } |