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 17:12:10 UTC
[1/5] cassandra git commit: change list to arraylist
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 f7884c50e -> 730d4d4c4
refs/heads/trunk 854406f47 -> ea6004e9a
change list to arraylist
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e3e2de0c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e3e2de0c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e3e2de0c
Branch: refs/heads/cassandra-2.1
Commit: e3e2de0c439b2ae10e2f95074926f74b834c75a3
Parents: 84b2846
Author: Brandon Williams <br...@apache.org>
Authored: Wed Apr 15 10:11:52 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Apr 15 10:11:52 2015 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e3e2de0c/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 85d79c0..c7c4af8 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -71,8 +71,9 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
static final ApplicationState[] STATES = ApplicationState.values();
static final List<String> DEAD_STATES = Arrays.asList(VersionedValue.REMOVING_TOKEN, VersionedValue.REMOVED_TOKEN,
VersionedValue.STATUS_LEFT, VersionedValue.HIBERNATE);
- static List<String> SILENT_SHUTDOWN_STATES = DEAD_STATES;
+ static ArrayList<String> SILENT_SHUTDOWN_STATES;
static {
+ SILENT_SHUTDOWN_STATES.addAll(DEAD_STATES);
SILENT_SHUTDOWN_STATES.add(VersionedValue.STATUS_BOOTSTRAPPING);
}
[4/5] 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/730d4d4c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/730d4d4c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/730d4d4c
Branch: refs/heads/cassandra-2.1
Commit: 730d4d4c4a324d598eb90fee584789d071851b6d
Parents: f7884c5 e3e2de0
Author: Brandon Williams <br...@apache.org>
Authored: Wed Apr 15 10:11:58 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Apr 15 10:11:58 2015 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/730d4d4c/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
[5/5] 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/ea6004e9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ea6004e9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ea6004e9
Branch: refs/heads/trunk
Commit: ea6004e9a24b89d5195935a1c1fcb65b20bfe624
Parents: 854406f 730d4d4
Author: Brandon Williams <br...@apache.org>
Authored: Wed Apr 15 10:12:06 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Apr 15 10:12:06 2015 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea6004e9/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
[2/5] cassandra git commit: change list to arraylist
Posted by br...@apache.org.
change list to arraylist
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e3e2de0c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e3e2de0c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e3e2de0c
Branch: refs/heads/trunk
Commit: e3e2de0c439b2ae10e2f95074926f74b834c75a3
Parents: 84b2846
Author: Brandon Williams <br...@apache.org>
Authored: Wed Apr 15 10:11:52 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Apr 15 10:11:52 2015 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e3e2de0c/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 85d79c0..c7c4af8 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -71,8 +71,9 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
static final ApplicationState[] STATES = ApplicationState.values();
static final List<String> DEAD_STATES = Arrays.asList(VersionedValue.REMOVING_TOKEN, VersionedValue.REMOVED_TOKEN,
VersionedValue.STATUS_LEFT, VersionedValue.HIBERNATE);
- static List<String> SILENT_SHUTDOWN_STATES = DEAD_STATES;
+ static ArrayList<String> SILENT_SHUTDOWN_STATES;
static {
+ SILENT_SHUTDOWN_STATES.addAll(DEAD_STATES);
SILENT_SHUTDOWN_STATES.add(VersionedValue.STATUS_BOOTSTRAPPING);
}
[3/5] 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/730d4d4c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/730d4d4c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/730d4d4c
Branch: refs/heads/trunk
Commit: 730d4d4c4a324d598eb90fee584789d071851b6d
Parents: f7884c5 e3e2de0
Author: Brandon Williams <br...@apache.org>
Authored: Wed Apr 15 10:11:58 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Apr 15 10:11:58 2015 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/730d4d4c/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------