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/797e3d5c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/797e3d5c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/797e3d5c Branch: refs/heads/trunk Commit: 797e3d5c8f17324d194af886f750c1acf35528ad Parents: fb4356a c80d2d3 Author: Yuki Morishita <yu...@apache.org> Authored: Tue Nov 11 15:36:40 2014 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Tue Nov 11 15:36:40 2014 -0600 ---------------------------------------------------------------------- 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/797e3d5c/src/java/org/apache/cassandra/tools/NodeTool.java ----------------------------------------------------------------------
