(accumulo) 01/01: Merge remote-tracking branch 'upstream/3.1'

[domgarguilo]

This is an automated email from the ASF dual-hosted git repository.

domgarguilo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit b7f4f97e49232c6220e7c6ba61ca5eec2c04a324
Merge: ac0db828c7 90bf2f7d09
Author: Dom Garguilo <domgargu...@apache.org>
AuthorDate: Tue Sep 24 13:19:37 2024 -0400

    Merge remote-tracking branch 'upstream/3.1'
    
    # Conflicts:
    #       
server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/TabletServerMetrics.java