(accumulo) 02/02: 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 68c7e200622ac43498b336a4e7bd4a7bcd1a6888
Merge: 0525755e2e 33b889a98e
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Fri Jan 19 15:13:16 2024 -0500

    Merge branch '2.1'

 .../accumulo/server/tables/TableManager.java       | 22 ++++++++++++----------
 .../apache/accumulo/gc/SimpleGarbageCollector.java |  2 +-
 .../accumulo/manager/FateServiceHandler.java       | 16 ++++++++++++----
 .../manager/tableOps/ChangeTableState.java         |  9 +++++++--
 .../manager/tableOps/clone/FinishCloneTable.java   |  9 +++++++--
 .../manager/tableOps/create/FinishCreateTable.java |  6 ++++--
 .../manager/tableOps/delete/DeleteTable.java       |  6 +++++-
 .../tableOps/tableImport/FinishImportTable.java    |  5 ++++-
 8 files changed, 52 insertions(+), 23 deletions(-)

diff --cc 
server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java
index 4532712ed7,0444099675..9d66cdcc93
--- 
a/server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java
+++ 
b/server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java
@@@ -62,7 -62,7 +63,8 @@@ import org.apache.accumulo.core.conf.Pr
  import org.apache.accumulo.core.data.NamespaceId;
  import org.apache.accumulo.core.data.TableId;
  import org.apache.accumulo.core.fate.ReadOnlyTStore.TStatus;
+ import org.apache.accumulo.core.manager.state.tables.TableState;
 +import org.apache.accumulo.core.manager.thrift.BulkImportState;
  import org.apache.accumulo.core.manager.thrift.FateOperation;
  import org.apache.accumulo.core.manager.thrift.FateService;
  import org.apache.accumulo.core.manager.thrift.ThriftPropertyException;