This is an automated email from the ASF dual-hosted git repository. dlmarion pushed a change to branch 3.1 in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 51633db8df Merge branch '2.1' into 3.1 add ba9c376ecc Increase majc priority for tablets over file size threshold (#5026) new f6c0da3f72 Merge branch '2.1' into 3.1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../core/spi/compaction/CompactionPlanner.java | 9 + .../spi/compaction/DefaultCompactionPlanner.java | 21 ++- .../util/compaction/CompactionJobPrioritizer.java | 143 +++++++++++++--- .../compaction/DefaultCompactionPlannerTest.java | 8 + .../util/compaction/CompactionPrioritizerTest.java | 185 ++++++++++++++++++--- .../tserver/compactions/CompactionService.java | 7 + 6 files changed, 324 insertions(+), 49 deletions(-)