(accumulo) 01/01: Merge branch '3.1'

[kturner]

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

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

commit 7f7cf05c92c908f5ed9755d6de497dcfea636d20
Merge: f129a587f7 3b5d9cf68c
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Wed Feb 12 00:41:30 2025 +0000

    Merge branch '3.1'

 .../apache/accumulo/manager/tableOps/Utils.java    | 45 +++----------
 .../manager/tableOps/clone/CloneZookeeper.java     |  2 +-
 .../manager/tableOps/create/PopulateZookeeper.java |  5 +-
 .../manager/tableOps/rename/RenameTable.java       |  2 +-
 .../tableImport/ImportPopulateZookeeper.java       |  4 +-
 .../apache/accumulo/test/TableOperationsIT.java    | 74 ++++++++++++++++++++++
 6 files changed, 92 insertions(+), 40 deletions(-)

diff --cc 
server/manager/src/main/java/org/apache/accumulo/manager/tableOps/Utils.java
index a8089dbb13,4af608e75f..63cc2f3353
--- 
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/Utils.java
+++ 
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/Utils.java
@@@ -23,23 -23,14 +23,18 @@@ import static java.nio.charset.Standard
  import java.io.IOException;
  import java.math.BigInteger;
  import java.util.Base64;
- import java.util.HashMap;
- import java.util.Map;
 +import java.util.SortedMap;
  import java.util.SortedSet;
 +import java.util.TreeMap;
  import java.util.TreeSet;
  import java.util.concurrent.locks.Lock;
  import java.util.concurrent.locks.ReentrantLock;
  import java.util.function.Function;
  
  import org.apache.accumulo.core.Constants;
- import org.apache.accumulo.core.client.NamespaceNotFoundException;
 +import org.apache.accumulo.core.client.admin.TabletMergeability;
  import 
org.apache.accumulo.core.clientImpl.AcceptableThriftTableOperationException;
- import org.apache.accumulo.core.clientImpl.Namespace;
- import org.apache.accumulo.core.clientImpl.Namespaces;
 +import org.apache.accumulo.core.clientImpl.TabletMergeabilityUtil;
  import org.apache.accumulo.core.clientImpl.thrift.TableOperation;
  import org.apache.accumulo.core.clientImpl.thrift.TableOperationExceptionType;
  import org.apache.accumulo.core.data.AbstractId;