This is an automated email from the ASF dual-hosted git repository.
ddanielr pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 5922d90b95bcd611ed77515f4097af2473b0519b
Merge: bed5e3628d c0d548aae3
Author: Daniel Roberts <ddani...@gmail.com>
AuthorDate: Mon Jan 22 16:44:42 2024 +0000
Merge branch '2.1'
assemble/src/main/resources/LICENSE | 42 +++++++++++-----------
.../accumulo/server/compaction/FileCompactor.java | 16 +++++++--
.../coordinator/CompactionCoordinator.java | 3 +-
.../accumulo/coordinator/CompactionFinalizer.java | 3 +-
.../coordinator/DeadCompactionDetector.java | 4 +--
.../org/apache/accumulo/compactor/Compactor.java | 11 ++++--
.../accumulo/tserver/tablet/CompactableImpl.java | 5 +--
.../compaction/ExternalDoNothingCompactor.java | 5 ++-
8 files changed, 55 insertions(+), 34 deletions(-)
