You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2016/04/20 16:55:11 UTC
[1/3] cassandra git commit: fixed help text in sstabledump
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 9b48a0bf4 -> 5a77bd1f1
refs/heads/trunk 0541597e7 -> 7cd14d089
fixed help text in sstabledump
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5a77bd1f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5a77bd1f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5a77bd1f
Branch: refs/heads/cassandra-3.0
Commit: 5a77bd1f11823c64e7258ae03b98d539eabc7555
Parents: 9b48a0b
Author: Jon Haddad <jo...@jonhaddad.com>
Authored: Wed Apr 20 15:44:26 2016 +0100
Committer: Yuki Morishita <yu...@apache.org>
Committed: Wed Apr 20 09:52:29 2016 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/SSTableExport.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a77bd1f/src/java/org/apache/cassandra/tools/SSTableExport.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/SSTableExport.java b/src/java/org/apache/cassandra/tools/SSTableExport.java
index fd3b9cb..d918ff4 100644
--- a/src/java/org/apache/cassandra/tools/SSTableExport.java
+++ b/src/java/org/apache/cassandra/tools/SSTableExport.java
@@ -65,17 +65,17 @@ public class SSTableExport
{
Config.setClientMode(true);
- Option optKey = new Option(KEY_OPTION, true, "Row key");
+ Option optKey = new Option(KEY_OPTION, true, "Partition key");
// Number of times -k <key> can be passed on the command line.
optKey.setArgs(500);
options.addOption(optKey);
- Option excludeKey = new Option(EXCLUDE_KEY_OPTION, true, "Excluded row key");
+ Option excludeKey = new Option(EXCLUDE_KEY_OPTION, true, "Excluded partition key");
// Number of times -x <key> can be passed on the command line.
excludeKey.setArgs(500);
options.addOption(excludeKey);
- Option optEnumerate = new Option(ENUMERATE_KEYS_OPTION, false, "enumerate keys only");
+ Option optEnumerate = new Option(ENUMERATE_KEYS_OPTION, false, "enumerate partition keys only");
options.addOption(optEnumerate);
Option debugOutput = new Option(DEBUG_OUTPUT_OPTION, false, "CQL row per line internal representation");
[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by yu...@apache.org.
Merge branch 'cassandra-3.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/7cd14d08
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7cd14d08
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7cd14d08
Branch: refs/heads/trunk
Commit: 7cd14d0894c4fc9d549af848249d2cfe1fcb82f0
Parents: 0541597 5a77bd1
Author: Yuki Morishita <yu...@apache.org>
Authored: Wed Apr 20 09:52:51 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Wed Apr 20 09:52:51 2016 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/SSTableExport.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[2/3] cassandra git commit: fixed help text in sstabledump
Posted by yu...@apache.org.
fixed help text in sstabledump
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5a77bd1f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5a77bd1f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5a77bd1f
Branch: refs/heads/trunk
Commit: 5a77bd1f11823c64e7258ae03b98d539eabc7555
Parents: 9b48a0b
Author: Jon Haddad <jo...@jonhaddad.com>
Authored: Wed Apr 20 15:44:26 2016 +0100
Committer: Yuki Morishita <yu...@apache.org>
Committed: Wed Apr 20 09:52:29 2016 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/SSTableExport.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a77bd1f/src/java/org/apache/cassandra/tools/SSTableExport.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/SSTableExport.java b/src/java/org/apache/cassandra/tools/SSTableExport.java
index fd3b9cb..d918ff4 100644
--- a/src/java/org/apache/cassandra/tools/SSTableExport.java
+++ b/src/java/org/apache/cassandra/tools/SSTableExport.java
@@ -65,17 +65,17 @@ public class SSTableExport
{
Config.setClientMode(true);
- Option optKey = new Option(KEY_OPTION, true, "Row key");
+ Option optKey = new Option(KEY_OPTION, true, "Partition key");
// Number of times -k <key> can be passed on the command line.
optKey.setArgs(500);
options.addOption(optKey);
- Option excludeKey = new Option(EXCLUDE_KEY_OPTION, true, "Excluded row key");
+ Option excludeKey = new Option(EXCLUDE_KEY_OPTION, true, "Excluded partition key");
// Number of times -x <key> can be passed on the command line.
excludeKey.setArgs(500);
options.addOption(excludeKey);
- Option optEnumerate = new Option(ENUMERATE_KEYS_OPTION, false, "enumerate keys only");
+ Option optEnumerate = new Option(ENUMERATE_KEYS_OPTION, false, "enumerate partition keys only");
options.addOption(optEnumerate);
Option debugOutput = new Option(DEBUG_OUTPUT_OPTION, false, "CQL row per line internal representation");