Merge branch 'cassandra-1.2' into trunk
Conflicts:
src/java/org/apache/cassandra/service/StorageService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eec01e9f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eec01e9f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eec01e9f
Branch: refs/heads/trunk
Commit: eec01e9fe8668c6b08be87e3680c35824e02bef9
Parents: e4ebd5f 3280fb0
Author: Brandon Williams <brandonwilli...@apache.org>
Authored: Mon Jul 15 23:45:14 2013 -0500
Committer: Brandon Williams <brandonwilli...@apache.org>
Committed: Mon Jul 15 23:45:14 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/eec01e9f/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 195e592,7f1bdbc..a31c10a
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -877,8 -919,8 +877,8 @@@ public class StorageService extends Not
private void bootstrap(Collection<Token> tokens)
{
isBootstrapMode = true;
- SystemTable.updateTokens(tokens); // DON'T use setToken, that makes
us part of the ring locally which is incorrect until we are done bootstrapping
+ SystemKeyspace.updateTokens(tokens); // DON'T use setToken, that
makes us part of the ring locally which is incorrect until we are done
bootstrapping
- if (DatabaseDescriptor.isReplacing())
+ if (!DatabaseDescriptor.isReplacing())
{
// if not an existing token then bootstrap
// order is important here, the gossiper can fire in between
adding these two states. It's ok to send TOKENS without STATUS, but *not* vice
versa.
