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/fe54388b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe54388b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fe54388b Branch: refs/heads/trunk Commit: fe54388ba3576b4ef28e591e847fbb58f27ecfca Parents: bce594f 3a70933 Author: Dave Brosius <dbros...@apache.org> Authored: Fri Sep 27 20:48:38 2013 -0400 Committer: Dave Brosius <dbros...@apache.org> Committed: Fri Sep 27 20:48:38 2013 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/tools/NodeCmd.java | 10 +++++----- .../org/apache/cassandra/tools/NodeToolHelp.yaml | 6 ++++-- 3 files changed, 10 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe54388b/CHANGES.txt ----------------------------------------------------------------------
