This is an automated email from the ASF dual-hosted git repository. edcoleman pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 29a5b83d019bf61715021c2ff0f6fb5152ca1e40
Merge: 5a7e6eba0c b0ad92e1c7
Author: Ed Coleman <edcole...@apache.org>
AuthorDate: Sat Nov 25 01:08:04 2023 +0000
Merge remote-tracking branch 'upstream/2.1'
