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/349669ed Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/349669ed Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/349669ed Branch: refs/heads/trunk Commit: 349669ed9c39610c19ac68b381b873a49bc88b5e Parents: 9f4284a 88c7196 Author: Yuki Morishita <[email protected]> Authored: Thu Oct 2 13:16:39 2014 -0500 Committer: Yuki Morishita <[email protected]> Committed: Thu Oct 2 13:16:39 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/tools/NodeTool.java | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/349669ed/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/349669ed/src/java/org/apache/cassandra/tools/NodeTool.java ----------------------------------------------------------------------
