Merge branch 'cassandra-3.11' into cassandra-3.X
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fcc19a1f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fcc19a1f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fcc19a1f Branch: refs/heads/cassandra-3.X Commit: fcc19a1fa022dec02b8fe0c94e10973202c7bd50 Parents: b1e23ab 9924756 Author: Paulo Motta <[email protected]> Authored: Thu Dec 15 17:40:37 2016 -0200 Committer: Paulo Motta <[email protected]> Committed: Thu Dec 15 17:40:37 2016 -0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/compaction/CompactionManager.java | 21 +++++++++++--------- .../cassandra/service/ActiveRepairService.java | 4 ++-- .../db/compaction/AntiCompactionTest.java | 17 ++++++++++------ 4 files changed, 26 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fcc19a1f/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fcc19a1f/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ----------------------------------------------------------------------
