(accumulo) 01/01: Merge branch '2.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 810d4b10e6381aa2ea73ca46b2e59f4f6a7334de
Merge: 6dc1bcfa55 59b1c170a3
Author: Dom G <domgargu...@apache.org>
AuthorDate: Fri Jan 5 11:15:28 2024 -0500

    Merge branch '2.1'

 .../core/client/admin/NamespaceOperations.java     | 18 +++++++-------
 .../core/client/admin/TableOperations.java         | 28 ++++++++++++----------
 .../accumulo/manager/FateServiceHandler.java       |  7 +++---
 .../tableOps/tableImport/FinishImportTable.java    |  5 ++--
 .../manager/tableOps/tableImport/ImportTable.java  |  4 ++--
 .../tableOps/tableImport/ImportedTableInfo.java    |  2 +-
 .../org/apache/accumulo/test/ImportExportIT.java   |  2 ++
 7 files changed, 35 insertions(+), 31 deletions(-)

diff --cc test/src/main/java/org/apache/accumulo/test/ImportExportIT.java
index 923ed5d8ab,49f01c1b36..0e1242dcc1
--- a/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java
@@@ -46,11 -45,10 +46,12 @@@ import org.apache.accumulo.core.client.
  import org.apache.accumulo.core.client.admin.ImportConfiguration;
  import org.apache.accumulo.core.data.Key;
  import org.apache.accumulo.core.data.Mutation;
 +import org.apache.accumulo.core.data.Range;
  import org.apache.accumulo.core.data.TableId;
  import org.apache.accumulo.core.data.Value;
+ import org.apache.accumulo.core.manager.state.tables.TableState;
  import org.apache.accumulo.core.metadata.MetadataTable;
 +import org.apache.accumulo.core.metadata.StoredTabletFile;
  import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection;
  import 
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.DataFileColumnFamily;
  import 
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.ServerColumnFamily;