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

[dlmarion]

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

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

commit 64de0f0aa768c040533107f29b715d636631e41e
Merge: 8fe933a671 a8d3a101d7
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Mon May 20 13:21:02 2024 +0000

    Merge branch '2.1'

 .../org/apache/accumulo/tserver/ScanServer.java    |  17 +++
 .../apache/accumulo/tserver/ScanServerTest.java    | 132 ++++++++++++++++++---
 2 files changed, 134 insertions(+), 15 deletions(-)

diff --cc 
server/tserver/src/test/java/org/apache/accumulo/tserver/ScanServerTest.java
index cad9d15aff,73a3e0d03b..f93f095a87
--- 
a/server/tserver/src/test/java/org/apache/accumulo/tserver/ScanServerTest.java
+++ 
b/server/tserver/src/test/java/org/apache/accumulo/tserver/ScanServerTest.java
@@@ -66,8 -64,9 +66,9 @@@ public class ScanServerTest 
      private KeyExtent extent;
      private TabletResolver resolver;
      private ScanReservation reservation;
+     private boolean systemUser;
  
 -    protected TestScanServer(ScanServerOpts opts, String[] args) {
 +    protected TestScanServer(ConfigOpts opts, String[] args) {
        super(opts, args);
      }