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/053c17d8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/053c17d8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/053c17d8 Branch: refs/heads/trunk Commit: 053c17d88ebcfc8d938a69f361333b7d29ae1d08 Parents: 46d0761 fbc112d Author: Vijay <[email protected]> Authored: Sat Mar 22 19:27:50 2014 -0700 Committer: Vijay <[email protected]> Committed: Sat Mar 22 19:27:50 2014 -0700 ---------------------------------------------------------------------- conf/commitlog_archiving.properties | 2 +- .../org/apache/cassandra/tools/NodeTool.java | 43 +++++++++----------- 2 files changed, 20 insertions(+), 25 deletions(-) ----------------------------------------------------------------------
