(accumulo) 01/01: Merge remote-tracking branch 'upstream/2.1' into 3.1

[kturner]

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

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

commit dcf951f8116c6d38ae2bbcf444ec7399367c6545
Merge: a49009c608 e8357c4d7f
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Fri Aug 30 00:18:53 2024 +0000

    Merge remote-tracking branch 'upstream/2.1' into 3.1

 .../org/apache/accumulo/test/CloseScannerIT.java   | 76 +++++++++++++++++-----
 .../apache/accumulo/test/functional/ScannerIT.java |  4 ++
 2 files changed, 63 insertions(+), 17 deletions(-)

diff --cc test/src/main/java/org/apache/accumulo/test/functional/ScannerIT.java
index 0a479e2df4,f767df4fdf..c5069b5323
--- a/test/src/main/java/org/apache/accumulo/test/functional/ScannerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ScannerIT.java
@@@ -37,7 -37,9 +37,8 @@@ import org.apache.accumulo.core.data.Mu
  import org.apache.accumulo.core.data.Range;
  import org.apache.accumulo.core.data.Value;
  import org.apache.accumulo.core.security.Authorizations;
 -import org.apache.accumulo.core.util.UtilWaitThread;
  import org.apache.accumulo.harness.AccumuloClusterHarness;
+ import org.apache.accumulo.test.CloseScannerIT;
  import org.apache.accumulo.test.util.Wait;
  import org.junit.jupiter.api.Test;