(accumulo) branch 3.1 updated (31b43ab0b6 -> ab70503be1)

[kt...@apache.org]

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

kturner pushed a change to branch 3.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git


    from 31b43ab0b6 Fix table names in SimpleGarbageCollector caused by previous merge (#5314)
     add 62e09a06d0 uses consistent zk host addr in MAC (#5316)
     new ab70503be1 Merge remote-tracking branch 'upstream/2.1' into 3.1

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java | 5 +++--
 .../org/apache/accumulo/miniclusterImpl/MiniAccumuloConfigImpl.java  | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

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

[kt...@apache.org]

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

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

commit ab70503be160bcc2367e0be3159a8e6dd1218827
Merge: 31b43ab0b6 62e09a06d0
Author: Keith Turner <kt...@apache.org>
AuthorDate: Fri Feb 7 21:17:15 2025 +0000

    Merge remote-tracking branch 'upstream/2.1' into 3.1

 .../org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java | 5 +++--
 .../org/apache/accumulo/miniclusterImpl/MiniAccumuloConfigImpl.java  | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)