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:40:44 UTC
[1/6] cassandra git commit: lists work better when you initialize them
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 8e1bdf3e8 -> a64bc43f8
refs/heads/cassandra-2.1 7b5021324 -> 3c17ac6e1
refs/heads/trunk f6b424ff7 -> 46c3f7d87
lists work better when you initialize them
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a64bc43f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a64bc43f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a64bc43f
Branch: refs/heads/cassandra-2.0
Commit: a64bc43f8da05114fa1d9e9c6409e82361d659f0
Parents: 8e1bdf3
Author: Brandon Williams <br...@apache.org>
Authored: Wed Apr 15 10:39:37 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Apr 15 10:40:16 2015 -0500
----------------------------------------------------------------------
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/a64bc43f/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 c7c4af8..b77064d 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -71,7 +71,7 @@ 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 ArrayList<String> SILENT_SHUTDOWN_STATES;
+ static ArrayList<String> SILENT_SHUTDOWN_STATES = new ArrayList<>();
static {
SILENT_SHUTDOWN_STATES.addAll(DEAD_STATES);
SILENT_SHUTDOWN_STATES.add(VersionedValue.STATUS_BOOTSTRAPPING);
[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/3c17ac6e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3c17ac6e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3c17ac6e
Branch: refs/heads/trunk
Commit: 3c17ac6e1c3da822013c99a179e9e4030b5086f9
Parents: 7b50213 a64bc43
Author: Brandon Williams <br...@apache.org>
Authored: Wed Apr 15 10:40:25 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Apr 15 10:40:25 2015 -0500
----------------------------------------------------------------------
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/3c17ac6e/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
[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/46c3f7d8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/46c3f7d8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/46c3f7d8
Branch: refs/heads/trunk
Commit: 46c3f7d875926d10f53cc5d05e3b0a666fda3af4
Parents: f6b424f 3c17ac6
Author: Brandon Williams <br...@apache.org>
Authored: Wed Apr 15 10:40:36 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Apr 15 10:40:36 2015 -0500
----------------------------------------------------------------------
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/46c3f7d8/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
[3/6] cassandra git commit: lists work better when you initialize them
Posted by br...@apache.org.
lists work better when you initialize them
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a64bc43f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a64bc43f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a64bc43f
Branch: refs/heads/trunk
Commit: a64bc43f8da05114fa1d9e9c6409e82361d659f0
Parents: 8e1bdf3
Author: Brandon Williams <br...@apache.org>
Authored: Wed Apr 15 10:39:37 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Apr 15 10:40:16 2015 -0500
----------------------------------------------------------------------
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/a64bc43f/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 c7c4af8..b77064d 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -71,7 +71,7 @@ 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 ArrayList<String> SILENT_SHUTDOWN_STATES;
+ static ArrayList<String> SILENT_SHUTDOWN_STATES = new ArrayList<>();
static {
SILENT_SHUTDOWN_STATES.addAll(DEAD_STATES);
SILENT_SHUTDOWN_STATES.add(VersionedValue.STATUS_BOOTSTRAPPING);
[2/6] cassandra git commit: lists work better when you initialize them
Posted by br...@apache.org.
lists work better when you initialize them
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a64bc43f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a64bc43f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a64bc43f
Branch: refs/heads/cassandra-2.1
Commit: a64bc43f8da05114fa1d9e9c6409e82361d659f0
Parents: 8e1bdf3
Author: Brandon Williams <br...@apache.org>
Authored: Wed Apr 15 10:39:37 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Apr 15 10:40:16 2015 -0500
----------------------------------------------------------------------
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/a64bc43f/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 c7c4af8..b77064d 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -71,7 +71,7 @@ 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 ArrayList<String> SILENT_SHUTDOWN_STATES;
+ static ArrayList<String> SILENT_SHUTDOWN_STATES = new ArrayList<>();
static {
SILENT_SHUTDOWN_STATES.addAll(DEAD_STATES);
SILENT_SHUTDOWN_STATES.add(VersionedValue.STATUS_BOOTSTRAPPING);
[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/3c17ac6e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3c17ac6e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3c17ac6e
Branch: refs/heads/cassandra-2.1
Commit: 3c17ac6e1c3da822013c99a179e9e4030b5086f9
Parents: 7b50213 a64bc43
Author: Brandon Williams <br...@apache.org>
Authored: Wed Apr 15 10:40:25 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Apr 15 10:40:25 2015 -0500
----------------------------------------------------------------------
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/3c17ac6e/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------