Merge branch 'cassandra-2.0.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dd13281c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd13281c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dd13281c Branch: refs/heads/cassandra-2.0 Commit: dd13281c253b38029141715efc64738355391469 Parents: 65f189b 1db8a22 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Aug 14 11:36:37 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Aug 14 11:36:37 2013 -0500 ---------------------------------------------------------------------- NEWS.txt | 10 ++-- .../org/apache/cassandra/tools/NodeCmd.java | 48 ++++++++++---------- 2 files changed, 31 insertions(+), 27 deletions(-) ----------------------------------------------------------------------
