diff options
author | Andreas Eriksen <andreer@verizonmedia.com> | 2019-11-19 13:48:25 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-19 13:48:25 +0100 |
commit | cd21dace49b3890ad2705fe6e51861da19bff7a3 (patch) | |
tree | 3d861a21715fca7538501ea267a45ab944381223 | |
parent | e8c2faeb2c1feac0a3712592f4a55ce276d2fc60 (diff) | |
parent | 339ff4f44fc5919044ea58febafb3cad9f8e2c23 (diff) |
Merge pull request #11349 from vespa-engine/olaa/correct-grouping-of-hosts
Include basic merge function for hosts with more than one application
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceTagMaintainer.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceTagMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceTagMaintainer.java index 44e21b3aed9..85603704d43 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceTagMaintainer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceTagMaintainer.java @@ -47,7 +47,8 @@ public class ResourceTagMaintainer extends Maintainer { .filter(node -> node.parentHostname().isPresent() && node.owner().isPresent()) .collect(Collectors.toMap( node -> node.parentHostname().get(), - node -> node.owner().get() + node -> node.owner().get(), + (node1, node2) -> node1 )); } } |