Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8f0952eb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8f0952eb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8f0952eb Branch: refs/heads/cassandra-2.1 Commit: 8f0952eb53259a9fc21aba5128168e09c257c603 Parents: 656edc5 1e1129c Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Sat Mar 8 21:50:22 2014 -0500 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Sat Mar 8 21:50:22 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/tools/NodeProbe.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f0952eb/src/java/org/apache/cassandra/tools/NodeProbe.java ----------------------------------------------------------------------
