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/2266fb3e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2266fb3e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2266fb3e Branch: refs/heads/trunk Commit: 2266fb3e4d847ffbb581c3e3ceb913c3e4152165 Parents: 56674e0 1ba9593 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Mon Sep 15 23:50:09 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Mon Sep 15 23:50:09 2014 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/tools/NodeTool.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2266fb3e/src/java/org/apache/cassandra/tools/NodeTool.java ----------------------------------------------------------------------
