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/0c34fa8e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0c34fa8e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0c34fa8e Branch: refs/heads/trunk Commit: 0c34fa8e9750a64e82e5fd392a0be48c2f84e9e1 Parents: d143206 bd45c4c Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Oct 15 11:18:31 2013 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Oct 15 11:18:31 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 3 + .../org/apache/cassandra/tools/NodeCmd.java | 104 +++++++++++++++++-- .../apache/cassandra/tools/NodeToolHelp.yaml | 4 +- 3 files changed, 102 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c34fa8e/CHANGES.txt ----------------------------------------------------------------------
