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/370e72d0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/370e72d0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/370e72d0 Branch: refs/heads/trunk Commit: 370e72d0f2357face9c05f5c970baf650fb79a1f Parents: a4d0758 4223aad Author: Brandon Williams <[email protected]> Authored: Fri Feb 13 12:11:28 2015 -0600 Committer: Brandon Williams <[email protected]> Committed: Fri Feb 13 12:11:28 2015 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/tools/NodeTool.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/370e72d0/src/java/org/apache/cassandra/tools/NodeTool.java ----------------------------------------------------------------------
