This is an automated email from the ASF dual-hosted git repository. dlmarion pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 671675c81af80c2384f01a3d0b03f2d4b0a969c8 Merge: d185870c31 c06fa70459 Author: Dave Marion <[email protected]> AuthorDate: Mon Jan 6 20:01:20 2025 +0000 Merge remote-tracking branch 'upstream/main' .../accumulo/core/metadata/schema/Ample.java | 11 ++++++++++ .../metadata/ConditionalTabletMutatorImpl.java | 12 ++++++++++- .../metadata/ConditionalTabletsMutatorImpl.java | 19 +++++++++++------ .../accumulo/manager/TabletGroupWatcher.java | 12 +++++------ .../coordinator/CompactionCoordinator.java | 5 +++-- .../coordinator/commit/CommitCompaction.java | 5 +++-- .../availability/SetTabletAvailability.java | 3 ++- .../tableOps/bulkVer2/CleanUpBulkImport.java | 2 +- .../manager/tableOps/bulkVer2/LoadFiles.java | 2 +- .../manager/tableOps/compact/CompactionDriver.java | 20 +++++++++++------- .../manager/tableOps/delete/ReserveTablets.java | 3 ++- .../manager/tableOps/merge/DeleteRows.java | 24 +++++++++++++--------- .../test/functional/AmpleConditionalWriterIT.java | 6 ++++-- 13 files changed, 83 insertions(+), 41 deletions(-)
