diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2020-01-14 08:12:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-14 08:12:48 +0100 |
| commit | 29d57953ea867faa7233e9110630ba614ea23b39 (patch) | |
| tree | 70ec015c2041f545cc9560fce769f3aa9dc5d54a | |
| parent | b24667e4f883a1ad513fcaab3d47ef604611c7d4 (diff) | |
| parent | 6b11fb264925853fe1937b7db5095a0d79564188 (diff) | |
Merge pull request #11767 from vespa-engine/bratseth/allow-multiple-testers-on-one-parent
Allow multiple testers on the same parent
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java | 2 |
1 files changed, 1 insertions, 1 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 ab51fb13414..8b1afa42c50 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 @@ -155,7 +155,7 @@ class NodeAllocation { } private boolean checkForClashingParentHost() { - return zone.system() == SystemName.main && zone.environment().isProduction(); + return zone.system() == SystemName.main && zone.environment().isProduction() && ! application.instance().isTester(); } private boolean offeredNodeHasParentHostnameAlreadyAccepted(Collection<PrioritizableNode> accepted, Node offered) { |