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 cassandra-2.0 

Conflicts:
	src/java/org/apache/cassandra/gms/Gossiper.java
This commit is contained in:
Aleksey Yeschenko 2013-09-17 23:57:48 +03:00
parent 83b0b2fb5b 6e2401e00e
commit cfa097cdd5
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/gms/Gossiper.java
View File

@ -475,7 +475,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
epState.addApplicationState(ApplicationState.STATUS, StorageService.instance.valueFactory.left(tokens, computeExpireTime()));
handleMajorStateChange(endpoint, epState);
Uninterruptibles.sleepUninterruptibly(intervalInMillis * 4, TimeUnit.MILLISECONDS);
logger.warn("Finished killing {}", endpoint);
logger.warn("Finished assassinating {}", endpoint);
}
public boolean isKnownEndpoint(InetAddress endpoint)