summaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2017-11-10 13:25:02 +0100
committerGitHub <noreply@github.com>2017-11-10 13:25:02 +0100
commit638590dcc41d0500a6e40008cd775f2b9237cea2 (patch)
tree1c624ab4563af96310d0e233c7af432c5fe8a601 /config-model
parent12f7a4363ffd5877ce62cd835dd111703f3b87bf (diff)
Revert "Wire in deployment so that we can copy the file in when the old way i…"
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributor.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributor.java b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributor.java
index f6cc9203d00..8860f5c2249 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributor.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributor.java
@@ -110,5 +110,11 @@ public class FileDistributor {
public void reloadDeployFileDistributor(FileDistribution dbHandler) {
dbHandler.reloadDeployFileDistributor();
}
+
+ private Set<String> union(Set<String> hosts, String... additionalHosts) {
+ Set<String> result = new HashSet<>(hosts);
+ result.addAll(asList(additionalHosts));
+ return result;
+ }
}