Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/87825f82 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87825f82 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/87825f82 Branch: refs/heads/trunk Commit: 87825f8208fc21000a841f724c7f89f3702d8e70 Parents: c18968b e3b34dc Author: Yuki Morishita <[email protected]> Authored: Thu Sep 29 15:05:25 2016 -0500 Committer: Yuki Morishita <[email protected]> Committed: Thu Sep 29 15:05:25 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/compaction/CompactionManager.java | 6 +- .../org/apache/cassandra/repair/Validator.java | 9 +- .../org/apache/cassandra/utils/MerkleTree.java | 10 ++ .../org/apache/cassandra/utils/MerkleTrees.java | 10 ++ .../db/compaction/CompactionsTest.java | 2 +- .../apache/cassandra/repair/ValidatorTest.java | 167 ++++++++++++------- 7 files changed, 145 insertions(+), 60 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/87825f82/CHANGES.txt ----------------------------------------------------------------------
