Merge from 1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c5aa781e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5aa781e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c5aa781e Branch: refs/heads/trunk Commit: c5aa781e8568bf8b93244412d69ab68578610627 Parents: cd806dd c573c46 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Mar 19 21:42:21 2012 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Mar 19 21:42:21 2012 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/tools/NodeProbe.java | 19 +++++++++----- 1 files changed, 12 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5aa781e/src/java/org/apache/cassandra/tools/NodeProbe.java ----------------------------------------------------------------------