Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/420fd011 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/420fd011 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/420fd011 Branch: refs/heads/trunk Commit: 420fd01101fc0cb1be2f43981a6931580bfcc833 Parents: 97a529f 657e160 Author: Brandon Williams <[email protected]> Authored: Wed Feb 19 11:37:34 2014 -0600 Committer: Brandon Williams <[email protected]> Committed: Wed Feb 19 11:37:34 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 3 ++ .../org/apache/cassandra/tools/NodeTool.java | 56 ++++++++++++++++++-- 2 files changed, 54 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
