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/0494cf75 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0494cf75 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0494cf75 Branch: refs/heads/trunk Commit: 0494cf75c3eae0be7d0337674cb65d226575cf50 Parents: 284480f 2c28fde Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Sun Sep 14 20:48:12 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Sun Sep 14 20:48:12 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/0494cf75/src/java/org/apache/cassandra/tools/NodeTool.java ----------------------------------------------------------------------
