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

[ctubbsii]

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

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

commit de65ec8ee5c8f9b52cf097ef76e8fa4b11665c78
Merge: 224104de96 ee938f12a8
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Thu Apr 30 18:20:36 2026 -0400

    Merge branch '2.1'

 test/src/main/java/org/apache/accumulo/test/functional/ScannerIT.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --cc test/src/main/java/org/apache/accumulo/test/functional/ScannerIT.java
index c0584b139c,fe979b8351..4b34643122
--- a/test/src/main/java/org/apache/accumulo/test/functional/ScannerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ScannerIT.java
@@@ -48,8 -48,6 +48,7 @@@ import org.apache.accumulo.core.client.
  import org.apache.accumulo.core.client.Scanner;
  import org.apache.accumulo.core.client.ScannerBase.ConsistencyLevel;
  import org.apache.accumulo.core.client.TimedOutException;
 +import org.apache.accumulo.core.client.admin.servers.ServerId;
- import org.apache.accumulo.core.clientImpl.ClientContext;
  import org.apache.accumulo.core.clientImpl.ThriftScanner;
  import org.apache.accumulo.core.conf.ClientProperty;
  import org.apache.accumulo.core.conf.Property;