[accumulo] 01/01: Merge branch '2.1'

[ctubbsii]

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 e6026cbdc81bc0fec7b4c5f90459cb68336293c8
Merge: 57903f4636 64916fb724
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Wed Aug 16 17:05:55 2023 -0400

    Merge branch '2.1'

 assemble/bin/accumulo         | 2 +-
 assemble/conf/accumulo-env.sh | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)