Updated Branches: refs/heads/cassandra-1.1 ddab67d37 -> 6bddbb2dd refs/heads/cassandra-1.2 fa1f9bab7 -> 15214fee1 refs/heads/trunk af0a5687e -> 169e0b186
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/169e0b18 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/169e0b18 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/169e0b18 Branch: refs/heads/trunk Commit: 169e0b1863be349a0585df0f11ed75f571a092c5 Parents: af0a568 15214fe Author: Yuki Morishita <[email protected]> Authored: Fri Feb 1 15:35:00 2013 -0600 Committer: Yuki Morishita <[email protected]> Committed: Fri Feb 1 15:35:00 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/service/AntiEntropyService.java | 5 ++- src/java/org/apache/cassandra/tools/NodeCmd.java | 2 +- src/java/org/apache/cassandra/tools/NodeProbe.java | 17 ++++++++++++-- 4 files changed, 19 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/169e0b18/CHANGES.txt ----------------------------------------------------------------------
