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/5fb4e58b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5fb4e58b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5fb4e58b Branch: refs/heads/cassandra-2.2 Commit: 5fb4e58bc9d85f8248852982d4ef7a216967ade7 Parents: 01a11fd 264cf36 Author: blerer <[email protected]> Authored: Fri Aug 28 16:03:16 2015 +0200 Committer: blerer <[email protected]> Committed: Fri Aug 28 16:07:49 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(-) ----------------------------------------------------------------------
