You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2013/05/25 19:05:23 UTC
[1/2] git commit: fix nodetool clearsnapshot console message patch by
dbrosius reviewed by jbellis for cassandra-5478
Updated Branches:
refs/heads/trunk 83b62421e -> 6d27cc884
fix nodetool clearsnapshot console message
patch by dbrosius reviewed by jbellis for cassandra-5478
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7c9f17f9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7c9f17f9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7c9f17f9
Branch: refs/heads/trunk
Commit: 7c9f17f9525c7736010be31f596888cccd398cfd
Parents: 67e57a9
Author: Dave Brosius <db...@apache.org>
Authored: Sat May 25 13:00:05 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Sat May 25 13:00:05 2013 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/NodeCmd.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c9f17f9/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 b2732a5..dce9dba 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -1344,7 +1344,7 @@ public class NodeCmd
private static void handleSnapshots(NodeCommand nc, String tag, String[] cmdArgs, String columnFamily, NodeProbe probe) throws InterruptedException, IOException
{
String[] keyspaces = Arrays.copyOfRange(cmdArgs, 0, cmdArgs.length);
- System.out.print("Requested snapshot for: ");
+ System.out.print("Requested " + ((nc == NodeCommand.SNAPSHOT) ? "creating" : "clearing") + " snapshot for: ");
if ( keyspaces.length > 0 )
{
for (int i = 0; i < keyspaces.length; i++)
[2/2] git commit: Merge branch 'cassandra-1.2' into trunk
Posted by db...@apache.org.
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6d27cc88
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6d27cc88
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6d27cc88
Branch: refs/heads/trunk
Commit: 6d27cc884d3029e96c9a44928a602425df9b05b8
Parents: 83b6242 7c9f17f
Author: Dave Brosius <db...@apache.org>
Authored: Sat May 25 13:04:53 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Sat May 25 13:04:53 2013 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/NodeCmd.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d27cc88/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tools/NodeCmd.java
index 14c44ec,dce9dba..2e050a8
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@@ -1284,10 -1341,10 +1284,10 @@@ public class NodeCm
}
}
- private static void handleSnapshots(NodeCommand nc, String tag, String[] cmdArgs, String columnFamily, NodeProbe probe) throws InterruptedException, IOException
+ private static void handleSnapshots(NodeCommand nc, String tag, String[] cmdArgs, String columnFamily, NodeProbe probe) throws IOException
{
String[] keyspaces = Arrays.copyOfRange(cmdArgs, 0, cmdArgs.length);
- System.out.print("Requested snapshot for: ");
+ System.out.print("Requested " + ((nc == NodeCommand.SNAPSHOT) ? "creating" : "clearing") + " snapshot for: ");
if ( keyspaces.length > 0 )
{
for (int i = 0; i < keyspaces.length; i++)