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/c3ed25b0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c3ed25b0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c3ed25b0 Branch: refs/heads/cassandra-3.0 Commit: c3ed25b0ad43aad0deaade1b915ff8310c9ca3fc Parents: 90e0013 32bc8b0 Author: Yuki Morishita <[email protected]> Authored: Wed Aug 5 16:10:33 2015 -0500 Committer: Yuki Morishita <[email protected]> Committed: Wed Aug 5 16:10:33 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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3ed25b0/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3ed25b0/src/java/org/apache/cassandra/tools/NodeProbe.java ----------------------------------------------------------------------
