This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 30483a9b951ee65acf17c1dd489c07d98ef957b3
Merge: 05b5e68740 4652c5c479
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Wed Jun 11 15:10:14 2025 -0400
Merge commit '4652c5c479e61d34d76bad9baf8806cbefc893c7'
Merge to main using -sours of #5588 and #5620 (will need to be addressed
in a follow-on commit)
