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/69517263 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/69517263 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/69517263 Branch: refs/heads/trunk Commit: 695172631d80eb093ef56b71bfa9d444cb12a3c1 Parents: b533135 d201a25 Author: Yuki Morishita <yu...@apache.org> Authored: Tue Mar 3 15:03:16 2015 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Tue Mar 3 15:03:16 2015 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/tools/NodeTool.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/69517263/src/java/org/apache/cassandra/tools/NodeTool.java ----------------------------------------------------------------------
