Repository: cassandra Updated Branches: refs/heads/trunk 2e4c7a5a7 -> 700e3279e
Merge branch 'cassandra-2.1' into trunk Allow takeColumnFamilySnapshot to take a list of tables patch by Sachin Jarin; reviewed by Nick Bailey for CASSANDRA-8348 (fixup for NodeTool commands moving out to top level classes) Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/700e3279 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/700e3279 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/700e3279 Branch: refs/heads/trunk Commit: 700e3279e68c9c72d50e821a855cae38b5e5b169 Parents: 2e4c7a5 Author: Dave Brosius <[email protected]> Authored: Tue Apr 14 19:13:53 2015 -0400 Committer: Dave Brosius <[email protected]> Committed: Tue Apr 14 19:13:53 2015 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/tools/nodetool/Snapshot.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/700e3279/src/java/org/apache/cassandra/tools/nodetool/Snapshot.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/Snapshot.java b/src/java/org/apache/cassandra/tools/nodetool/Snapshot.java index d2eab9a..14c14ad 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Snapshot.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Snapshot.java @@ -42,7 +42,7 @@ public class Snapshot extends NodeToolCmd @Option(title = "tag", name = {"-t", "--tag"}, description = "The name of the snapshot") private String snapshotName = Long.toString(System.currentTimeMillis()); - @Option(title = "kclist", name = { "-kc", "--kc-list" }, description = "The list of Keyspace.Column family to take snapshot.(you must not specify only keyspace)") + @Option(title = "ktlist", name = { "-kc", "--kc.list", "-kt", "--kt-list" }, description = "The list of Keyspace.table to take snapshot.(you must not specify only keyspace)") private String kcList = null; @Override @@ -53,6 +53,7 @@ public class Snapshot extends NodeToolCmd StringBuilder sb = new StringBuilder(); sb.append("Requested creating snapshot(s) for "); + // Create a separate path for kclist to avoid breaking of already existing scripts if (null != kcList && !kcList.isEmpty()) {
