summaryrefslogtreecommitdiffstats
path: root/vespajlib/src/main/java
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2020-02-27 08:58:46 +0100
committerJon Marius Venstad <venstad@gmail.com>2020-02-27 08:58:46 +0100
commit6f27ac0d14acd1fe23bc2e132045cd7846204ba3 (patch)
tree0b10523acbbf2ac3cb680bfd009fe0d398125095 /vespajlib/src/main/java
parent2019d53e728eee05b33edd7bac99e94f6498e3ff (diff)
Print nodes with services which need new config as well
Diffstat (limited to 'vespajlib/src/main/java')
-rw-r--r--vespajlib/src/main/java/com/yahoo/collections/AbstractFilteringList.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/collections/AbstractFilteringList.java b/vespajlib/src/main/java/com/yahoo/collections/AbstractFilteringList.java
index b7c6322d951..2e51a4ceafe 100644
--- a/vespajlib/src/main/java/com/yahoo/collections/AbstractFilteringList.java
+++ b/vespajlib/src/main/java/com/yahoo/collections/AbstractFilteringList.java
@@ -63,7 +63,7 @@ public abstract class AbstractFilteringList<Type, ListType extends AbstractFilte
}
/** Returns the union of the two lists. */
- public ListType and(ListType others) {
+ public ListType concat(ListType others) {
return constructor.apply(Stream.concat(items.stream(), others.asList().stream()).collect(toUnmodifiableList()), false);
}