You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by pa...@apache.org on 2016/12/15 19:44:12 UTC
[3/4] cassandra git commit: Merge branch 'cassandra-3.11' into
cassandra-3.X
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/trunk
Commit: fcc19a1fa022dec02b8fe0c94e10973202c7bd50
Parents: b1e23ab 9924756
Author: Paulo Motta <pa...@apache.org>
Authored: Thu Dec 15 17:40:37 2016 -0200
Committer: Paulo Motta <pa...@apache.org>
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
----------------------------------------------------------------------