Merge branch cassandra-2.2 into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/efe9a7dc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/efe9a7dc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/efe9a7dc Branch: refs/heads/trunk Commit: efe9a7dc4d185a2dfe35b7a77f5bb853e323c52c Parents: b4104e1 5fb4e58 Author: blerer <benjamin.le...@datastax.com> Authored: Fri Aug 28 16:10:09 2015 +0200 Committer: blerer <benjamin.le...@datastax.com> Committed: Fri Aug 28 16:12:32 2015 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/tools/NodeTool.java | 8 ++++---- src/java/org/apache/cassandra/tools/nodetool/Status.java | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/efe9a7dc/src/java/org/apache/cassandra/tools/NodeTool.java ----------------------------------------------------------------------
