Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7a1edabd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7a1edabd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7a1edabd Branch: refs/heads/cassandra-2.1 Commit: 7a1edabd927e960ce4b2add88cc2ade2ba45d08e Parents: f873a32 43c2c16 Author: Brandon Williams <bran...@datastax.com> Authored: Thu Jul 17 15:59:13 2014 -0500 Committer: Brandon Williams <bran...@datastax.com> Committed: Thu Jul 17 15:59:13 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/tools/NodeTool.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
