Updated Branches: refs/heads/trunk 23da64c81 -> c7230f2e2
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/c7230f2e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7230f2e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7230f2e Branch: refs/heads/trunk Commit: c7230f2e287bc0358e6bba6c2b9879b8fa209863 Parents: 23da64c e4b3d40 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Mar 12 19:03:51 2013 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Mar 12 19:03:51 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/service/AntiEntropyService.java | 2 +- .../org/apache/cassandra/utils/MerkleTree.java | 3 +++ 3 files changed, 5 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7230f2e/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7230f2e/src/java/org/apache/cassandra/service/AntiEntropyService.java ----------------------------------------------------------------------
