Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c1aff4fa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c1aff4fa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c1aff4fa Branch: refs/heads/trunk Commit: c1aff4fa61e09396de56cfa365c56dbe256393ee Parents: 760dbd9 c3ed25b Author: Yuki Morishita <[email protected]> Authored: Wed Aug 5 16:10:42 2015 -0500 Committer: Yuki Morishita <[email protected]> Committed: Wed Aug 5 16:10:42 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/tools/NodeProbe.java | 16 ++------------ .../apache/cassandra/tools/nodetool/Info.java | 23 ++++++++++++++------ 3 files changed, 19 insertions(+), 21 deletions(-) ----------------------------------------------------------------------
