aboutsummaryrefslogtreecommitdiffstats
path: root/config-model/src/main/java/com/yahoo/vespa/model/filedistribution
diff options
context:
space:
mode:
authorHarald Musum <musum@yahoo-inc.com>2017-11-10 13:25:45 +0100
committerGitHub <noreply@github.com>2017-11-10 13:25:45 +0100
commit2c88e4fbaea77c6c79cf2e7f60632a340dbf4789 (patch)
tree3858bdbf2d73a4d64a7da5ecd465e37e62ad5e5d /config-model/src/main/java/com/yahoo/vespa/model/filedistribution
parent545c8c5b2bc971418ae90b0b7e5404d563375e5e (diff)
parent638590dcc41d0500a6e40008cd775f2b9237cea2 (diff)
Merge pull request #4084 from vespa-engine/revert-4067-balder/wire-in-filecopy-on-deploy-the-new-way
Revert "Wire in deployment so that we can copy the file in when the old way i…"
Diffstat (limited to 'config-model/src/main/java/com/yahoo/vespa/model/filedistribution')
-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;
+ }
}