This is an automated email from the ASF dual-hosted git repository. cshannon pushed a change to branch no-chop-merge in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 6fadff50bf update comments add 75140d8965 Add Message Prefix for File deletion actions in GCRun (#3745) add f7e59d3653 Merge branch '2.1' add 6c34c848c4 reverts #3747 that caused tablet split to fail (#3760) add 48d69f30a1 Merge branch '2.1' new 90944c5939 Merge branch 'main' into no-chop-merge 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: .../main/java/org/apache/accumulo/gc/GCRun.java | 24 +++++++++++++--------- .../accumulo/tserver/tablet/DatafileManager.java | 5 ++--- .../org/apache/accumulo/tserver/tablet/Tablet.java | 5 ++--- 3 files changed, 18 insertions(+), 16 deletions(-)