From 339ff4f44fc5919044ea58febafb3cad9f8e2c23 Mon Sep 17 00:00:00 2001
From: Ola Aunrønning <olaa@verizonmedia.com>
Date: Tue, 19 Nov 2019 13:45:37 +0100
Subject: Include basic merge function for hosts with more than one application

---
 .../vespa/hosted/controller/maintenance/ResourceTagMaintainer.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'controller-server')

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
                 ));
     }
 }
-- 
cgit v1.2.3