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/c3d10abc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c3d10abc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c3d10abc Branch: refs/heads/trunk Commit: c3d10abc7dc2c4bb9db358c3d510de29d5ae51ca Parents: 0494cf7 db3cc3e Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Sun Sep 14 22:01:53 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Sun Sep 14 22:01:53 2014 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/tools/NodeTool.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3d10abc/src/java/org/apache/cassandra/tools/NodeTool.java ----------------------------------------------------------------------
