Updated Branches: refs/heads/cassandra-2.0 ff5db5635 -> 99bef9dfe refs/heads/trunk 8e0aa710d -> 50b08f2b2
fix merge again Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/99bef9df Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/99bef9df Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/99bef9df Branch: refs/heads/cassandra-2.0 Commit: 99bef9dfe8bbf83526b5a3686a7eb1aaf7cb9b94 Parents: ff5db56 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Oct 18 11:15:57 2013 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Oct 18 11:15:57 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/99bef9df/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java index e6b11a4..4065c9e 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -932,7 +932,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE { // Dont set any state for the node which is bootstrapping the existing token... tokenMetadata.updateNormalTokens(tokens, FBUtilities.getBroadcastAddress()); - SystemTable.removeEndpoint(DatabaseDescriptor.getReplaceAddress()); + SystemKeyspace.removeEndpoint(DatabaseDescriptor.getReplaceAddress()); } if (!Gossiper.instance.seenAnySeed()) throw new IllegalStateException("Unable to contact any seeds!");
