Merge branch 'cassandra-2.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/a6f7d07a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a6f7d07a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a6f7d07a Branch: refs/heads/trunk Commit: a6f7d07a443ec07ef790f7566f588a90a25e4c70 Parents: 4100cf2 ecee395 Author: Yuki Morishita <yu...@apache.org> Authored: Wed Oct 9 10:36:49 2013 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Wed Oct 9 10:36:49 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/tools/NodeProbe.java | 57 ++++++++++++++------ 2 files changed, 42 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6f7d07a/CHANGES.txt ----------------------------------------------------------------------