natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-1.2' into trunk 

Conflicts:
	src/java/org/apache/cassandra/service/StorageService.java
This commit is contained in:
Brandon Williams 2013-07-15 23:45:14 -05:00
parent e4ebd5ff59 3280fb0878
commit eec01e9fe8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/org/apache/cassandra/service/StorageService.java
View File

@ -878,7 +878,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
{
isBootstrapMode = true;
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.