summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorOla Aunrønning <olaa@verizonmedia.com>2019-11-19 13:45:37 +0100
committerOla Aunrønning <olaa@verizonmedia.com>2019-11-19 13:45:37 +0100
commit339ff4f44fc5919044ea58febafb3cad9f8e2c23 (patch)
treeb088792b9919dd94420e56e68809b4fe8f99c250 /controller-server
parent957a7cc70ba85568618fb2b5282d38f009c688ea (diff)
Include basic merge function for hosts with more than one application
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceTagMaintainer.java3
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
));
}
}