You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2013/10/18 18:13:49 UTC
[3/5] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ff5db563
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ff5db563
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ff5db563
Branch: refs/heads/trunk
Commit: ff5db5635a246a4422fdd1a9ac01a16738506813
Parents: 718e3ec 4a382ff
Author: Brandon Williams <br...@apache.org>
Authored: Fri Oct 18 11:12:03 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Oct 18 11:12:03 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff5db563/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index b158a81,11393c6..e6b11a4
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -932,7 -965,9 +932,8 @@@ public class StorageService extends Not
{
// Dont set any state for the node which is bootstrapping the existing token...
tokenMetadata.updateNormalTokens(tokens, FBUtilities.getBroadcastAddress());
+ SystemTable.removeEndpoint(DatabaseDescriptor.getReplaceAddress());
}
- Tracing.instance();
if (!Gossiper.instance.seenAnySeed())
throw new IllegalStateException("Unable to contact any seeds!");
setMode(Mode.JOINING, "Starting to bootstrap...", true);