Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d7195060
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d7195060
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b3e6a433
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b3e6a433
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a90c3b2b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a90c3b2b
Diff: http://git-wip-us.apache.org/repos/asf
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fb4e58b/src/java/org/apache/cassandra/tools/NodeTool.java
--
diff --cc src/java/org/apache/cassandra/tools/NodeTool.java
index 10c0915,8e88f45..3cb51e2
--- a/src/java/org/apach