You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2015/04/15 16:36:00 UTC

[1/6] cassandra git commit: remove redundant state

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 b2c62bb20 -> 84b28460d
  refs/heads/cassandra-2.1 4f2c37289 -> f7884c50e
  refs/heads/trunk 68f9e9040 -> 854406f47


remove redundant state


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

Branch: refs/heads/cassandra-2.0
Commit: 84b28460da99b583561a8308b263e174f4fa9e2b
Parents: b2c62bb
Author: Brandon Williams <br...@apache.org>
Authored: Wed Apr 15 09:35:40 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Apr 15 09:35:40 2015 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/84b28460/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java
index 090033e..85d79c0 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -74,7 +74,6 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
     static List<String> SILENT_SHUTDOWN_STATES = DEAD_STATES;
     static {
         SILENT_SHUTDOWN_STATES.add(VersionedValue.STATUS_BOOTSTRAPPING);
-        SILENT_SHUTDOWN_STATES.add(VersionedValue.STATUS_LEFT);
     }
 
     private ScheduledFuture<?> scheduledGossipTask;

[6/6] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

Posted by br...@apache.org.
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 854406f47ed8ac564ce1ebc41149258884413dd4
Parents: 68f9e90 f7884c5
Author: Brandon Williams <br...@apache.org>
Authored: Wed Apr 15 09:35:55 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Apr 15 09:35:55 2015 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/854406f4/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------

[4/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: f7884c50e81f1c52ca46fd87cf18ddc0de71a33c
Parents: 4f2c372 84b2846
Author: Brandon Williams <br...@apache.org>
Authored: Wed Apr 15 09:35:48 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Apr 15 09:35:48 2015 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7884c50/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------

[3/6] cassandra git commit: remove redundant state

Posted by br...@apache.org.
remove redundant state


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

Branch: refs/heads/trunk
Commit: 84b28460da99b583561a8308b263e174f4fa9e2b
Parents: b2c62bb
Author: Brandon Williams <br...@apache.org>
Authored: Wed Apr 15 09:35:40 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Apr 15 09:35:40 2015 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/84b28460/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java
index 090033e..85d79c0 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -74,7 +74,6 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
     static List<String> SILENT_SHUTDOWN_STATES = DEAD_STATES;
     static {
         SILENT_SHUTDOWN_STATES.add(VersionedValue.STATUS_BOOTSTRAPPING);
-        SILENT_SHUTDOWN_STATES.add(VersionedValue.STATUS_LEFT);
     }
 
     private ScheduledFuture<?> scheduledGossipTask;

[5/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: f7884c50e81f1c52ca46fd87cf18ddc0de71a33c
Parents: 4f2c372 84b2846
Author: Brandon Williams <br...@apache.org>
Authored: Wed Apr 15 09:35:48 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Apr 15 09:35:48 2015 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7884c50/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------

[2/6] cassandra git commit: remove redundant state

Posted by br...@apache.org.
remove redundant state


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

Branch: refs/heads/cassandra-2.1
Commit: 84b28460da99b583561a8308b263e174f4fa9e2b
Parents: b2c62bb
Author: Brandon Williams <br...@apache.org>
Authored: Wed Apr 15 09:35:40 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Apr 15 09:35:40 2015 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/84b28460/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java
index 090033e..85d79c0 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -74,7 +74,6 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
     static List<String> SILENT_SHUTDOWN_STATES = DEAD_STATES;
     static {
         SILENT_SHUTDOWN_STATES.add(VersionedValue.STATUS_BOOTSTRAPPING);
-        SILENT_SHUTDOWN_STATES.add(VersionedValue.STATUS_LEFT);
     }
 
     private ScheduledFuture<?> scheduledGossipTask;