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/4831bf41 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4831bf41 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4831bf41 Branch: refs/heads/trunk Commit: 4831bf41e011c419328a9dd7d7809512e819983a Parents: c996a36 7a1edab Author: Brandon Williams <bran...@datastax.com> Authored: Thu Jul 17 15:59:21 2014 -0500 Committer: Brandon Williams <bran...@datastax.com> Committed: Thu Jul 17 15:59:21 2014 -0500 ---------------------------------------------------------------------- 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/4831bf41/src/java/org/apache/cassandra/tools/NodeTool.java ----------------------------------------------------------------------
