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/62491898 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/62491898 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/62491898 Branch: refs/heads/trunk Commit: 6249189884c4e76eb7ad8ce912fcaf2f98f84659 Parents: bc246e1 af863d7 Author: Yuki Morishita <[email protected]> Authored: Mon Oct 6 13:06:42 2014 -0500 Committer: Yuki Morishita <[email protected]> Committed: Mon Oct 6 13:06:42 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/tools/NodeProbe.java | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/62491898/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/62491898/src/java/org/apache/cassandra/tools/NodeProbe.java ----------------------------------------------------------------------
