Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/760dbd95 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/760dbd95 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/760dbd95 Branch: refs/heads/trunk Commit: 760dbd957c3c2cc69ea7d74a954891bbe3a156b4 Parents: de49ed8 90e0013 Author: Yuki Morishita <[email protected]> Authored: Wed Aug 5 15:43:30 2015 -0500 Committer: Yuki Morishita <[email protected]> Committed: Wed Aug 5 15:43:30 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/utils/MerkleTree.java | 56 +++++++++++++------- 2 files changed, 39 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
