Repository: cassandra Updated Branches: refs/heads/trunk daa3619ae -> 47a10649d
ninja fix bad merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/47a10649 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/47a10649 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/47a10649 Branch: refs/heads/trunk Commit: 47a10649dadbdea6960836a7c0fe6d271a476204 Parents: daa3619 Author: Benedict Elliott Smith <bened...@apple.com> Authored: Wed Oct 3 15:46:18 2018 +0100 Committer: Benedict Elliott Smith <bened...@apple.com> Committed: Wed Oct 3 15:46:18 2018 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/locator/ReplicaLayout.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/47a10649/src/java/org/apache/cassandra/locator/ReplicaLayout.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/locator/ReplicaLayout.java b/src/java/org/apache/cassandra/locator/ReplicaLayout.java index 54b82f9..d44fdd7 100644 --- a/src/java/org/apache/cassandra/locator/ReplicaLayout.java +++ b/src/java/org/apache/cassandra/locator/ReplicaLayout.java @@ -278,7 +278,7 @@ public abstract class ReplicaLayout<E extends Endpoints<E>> @VisibleForTesting static EndpointsForToken resolveWriteConflictsInNatural(EndpointsForToken natural, EndpointsForToken pending) { - EndpointsForToken.Mutable resolved = natural.newMutable(natural.size()); + EndpointsForToken.Builder resolved = natural.newBuilder(natural.size()); for (Replica replica : natural) { // always prefer the full natural replica, if there is a conflict @@ -297,7 +297,7 @@ public abstract class ReplicaLayout<E extends Endpoints<E>> } resolved.add(replica); } - return resolved.asSnapshot(); + return resolved.build(); } /** --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
