Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f6fd5bab Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f6fd5bab Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f6fd5bab Branch: refs/heads/trunk Commit: f6fd5bab7550bd8e4abc814f4ab607c9fce4b43c Parents: ee85c8e 373c033 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Jul 18 18:46:17 2013 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Jul 18 18:46:17 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/f6fd5bab/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/StorageService.java index 9d2e89a,d166553..12ba352 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -893,8 -942,9 +893,8 @@@ public class StorageService extends Not // Dont set any state for the node which is bootstrapping the existing token... tokenMetadata.updateNormalTokens(tokens, FBUtilities.getBroadcastAddress()); } - Tracing.instance(); if (!Gossiper.instance.seenAnySeed()) - throw new IllegalStateException("Unable to contact any seeds!") + throw new IllegalStateException("Unable to contact any seeds!"); setMode(Mode.JOINING, "Starting to bootstrap...", true); new BootStrapper(FBUtilities.getBroadcastAddress(), tokens, tokenMetadata).bootstrap(); // handles token update logger.info("Bootstrap completed! for the tokens {}", tokens);
