Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
        src/java/org/apache/cassandra/gms/Gossiper.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cfa097cd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cfa097cd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cfa097cd

Branch: refs/heads/trunk
Commit: cfa097cdd5e28d7fe8204248e246a1fae226d2c0
Parents: 83b0b2f 6e2401e
Author: Aleksey Yeschenko <alek...@apache.org>
Authored: Tue Sep 17 23:57:48 2013 +0300
Committer: Aleksey Yeschenko <alek...@apache.org>
Committed: Tue Sep 17 23:57:48 2013 +0300

----------------------------------------------------------------------
 src/java/org/apache/cassandra/gms/Gossiper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfa097cd/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/gms/Gossiper.java
index 518b9ab,b4ea88a..ed69442
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@@ -474,8 -480,15 +474,8 @@@ public class Gossiper implements IFailu
          // do not pass go, do not collect 200 dollars, just gtfo
          epState.addApplicationState(ApplicationState.STATUS, 
StorageService.instance.valueFactory.left(tokens, computeExpireTime()));
          handleMajorStateChange(endpoint, epState);
 -        try
 -        {
 -            Thread.sleep(intervalInMillis * 4);
 -        }
 -        catch (InterruptedException e)
 -        {
 -            throw new AssertionError(e);
 -        }
 +        Uninterruptibles.sleepUninterruptibly(intervalInMillis * 4, 
TimeUnit.MILLISECONDS);
-         logger.warn("Finished killing {}", endpoint);
+         logger.warn("Finished assassinating {}", endpoint);
      }
  
      public boolean isKnownEndpoint(InetAddress endpoint)

Reply via email to