Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b77debfd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b77debfd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b77debfd Branch: refs/heads/trunk Commit: b77debfd4669e23289652a23b9d0a81f0edb9300 Parents: f1b0c26 d585592 Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Aug 4 12:05:40 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Aug 4 12:05:40 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 11 +++++++++++ src/java/org/apache/cassandra/tools/NodeProbe.java | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b77debfd/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b77debfd/src/java/org/apache/cassandra/tools/NodeProbe.java ----------------------------------------------------------------------