(accumulo) 01/02: Merge commit 'e67cff2db2a89ec203e96ad0b65183764c0f4342'

[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 0525755e2eb5d99dbcd660444223df6018945229
Merge: 3bc0cfbfba e67cff2db2
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Fri Jan 19 15:11:33 2024 -0500

    Merge commit 'e67cff2db2a89ec203e96ad0b65183764c0f4342'
    
    Merge #4137 from 2.1 branch into main

 .../java/org/apache/accumulo/server/util/ManagerMetadataUtil.java  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --cc 
server/base/src/main/java/org/apache/accumulo/server/util/ManagerMetadataUtil.java
index 0497a6403f,c0b5e27fa6..eb179bd844
--- 
a/server/base/src/main/java/org/apache/accumulo/server/util/ManagerMetadataUtil.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/util/ManagerMetadataUtil.java
@@@ -40,11 -40,10 +40,10 @@@ import org.apache.accumulo.core.data.Ra
  import org.apache.accumulo.core.data.TableId;
  import org.apache.accumulo.core.data.Value;
  import org.apache.accumulo.core.dataImpl.KeyExtent;
 -import org.apache.accumulo.core.fate.zookeeper.ServiceLock;
 +import org.apache.accumulo.core.lock.ServiceLock;
- import org.apache.accumulo.core.metadata.AccumuloTable;
 +import org.apache.accumulo.core.metadata.ReferencedTabletFile;
  import org.apache.accumulo.core.metadata.StoredTabletFile;
  import org.apache.accumulo.core.metadata.TServerInstance;
 -import org.apache.accumulo.core.metadata.TabletFile;
  import org.apache.accumulo.core.metadata.schema.Ample;
  import org.apache.accumulo.core.metadata.schema.Ample.TabletMutator;
  import org.apache.accumulo.core.metadata.schema.DataFileValue;