This is an automated email from the ASF dual-hosted git repository. ddanielr pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
from bed5e3628d Merge branch '2.1' add fcaabbe427 More Detailed Compaction Errors (#4148) add c0d548aae3 Fix assembly LICENSE formatting new 5922d90b95 Merge branch '2.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: 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(-)