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 2013/10/16 14:34:42 UTC
[1/6] git commit: Fix nodetool status regression
Updated Branches:
refs/heads/cassandra-1.2 b33b53e8f -> 8d319b06a
refs/heads/cassandra-2.0 a1e594bfb -> 2ab13706b
refs/heads/trunk 3f1465779 -> b685e1118
Fix nodetool status regression
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d319b06
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d319b06
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d319b06
Branch: refs/heads/cassandra-1.2
Commit: 8d319b06a1086f31271c451f67a3d78b48aa0820
Parents: b33b53e
Author: Brandon Williams <br...@apache.org>
Authored: Wed Oct 16 07:32:27 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Oct 16 07:32:43 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/NodeCmd.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d319b06/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeCmd.java b/src/java/org/apache/cassandra/tools/NodeCmd.java
index 7e0bf67..87b114c 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -1174,7 +1174,8 @@ public class NodeCmd
case STATUS :
- nodeCmd.printClusterStatus(System.out, arguments[0]);
+ if (arguments.length > 0) nodeCmd.printClusterStatus(System.out, arguments[0]);
+ else nodeCmd.printClusterStatus(System.out, null);
break;
case DECOMMISSION :
[5/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2ab13706
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ab13706
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2ab13706
Branch: refs/heads/cassandra-2.0
Commit: 2ab13706baae737d456991abc704d68bd55cf44a
Parents: a1e594b 8d319b0
Author: Brandon Williams <br...@apache.org>
Authored: Wed Oct 16 07:32:55 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Oct 16 07:32:55 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/NodeCmd.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ab13706/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2ab13706
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ab13706
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2ab13706
Branch: refs/heads/trunk
Commit: 2ab13706baae737d456991abc704d68bd55cf44a
Parents: a1e594b 8d319b0
Author: Brandon Williams <br...@apache.org>
Authored: Wed Oct 16 07:32:55 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Oct 16 07:32:55 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/NodeCmd.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ab13706/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------
[2/6] git commit: Fix nodetool status regression
Posted by br...@apache.org.
Fix nodetool status regression
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d319b06
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d319b06
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d319b06
Branch: refs/heads/cassandra-2.0
Commit: 8d319b06a1086f31271c451f67a3d78b48aa0820
Parents: b33b53e
Author: Brandon Williams <br...@apache.org>
Authored: Wed Oct 16 07:32:27 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Oct 16 07:32:43 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/NodeCmd.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d319b06/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeCmd.java b/src/java/org/apache/cassandra/tools/NodeCmd.java
index 7e0bf67..87b114c 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -1174,7 +1174,8 @@ public class NodeCmd
case STATUS :
- nodeCmd.printClusterStatus(System.out, arguments[0]);
+ if (arguments.length > 0) nodeCmd.printClusterStatus(System.out, arguments[0]);
+ else nodeCmd.printClusterStatus(System.out, null);
break;
case DECOMMISSION :
[3/6] git commit: Fix nodetool status regression
Posted by br...@apache.org.
Fix nodetool status regression
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d319b06
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d319b06
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d319b06
Branch: refs/heads/trunk
Commit: 8d319b06a1086f31271c451f67a3d78b48aa0820
Parents: b33b53e
Author: Brandon Williams <br...@apache.org>
Authored: Wed Oct 16 07:32:27 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Oct 16 07:32:43 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/NodeCmd.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d319b06/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeCmd.java b/src/java/org/apache/cassandra/tools/NodeCmd.java
index 7e0bf67..87b114c 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -1174,7 +1174,8 @@ public class NodeCmd
case STATUS :
- nodeCmd.printClusterStatus(System.out, arguments[0]);
+ if (arguments.length > 0) nodeCmd.printClusterStatus(System.out, arguments[0]);
+ else nodeCmd.printClusterStatus(System.out, null);
break;
case DECOMMISSION :
[6/6] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b685e111
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b685e111
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b685e111
Branch: refs/heads/trunk
Commit: b685e11186dd4fa404b2b621eda78b8f2eb69a15
Parents: 3f14657 2ab1370
Author: Brandon Williams <br...@apache.org>
Authored: Wed Oct 16 07:33:05 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Oct 16 07:33:05 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/NodeCmd.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------