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

[dlmarion]

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

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

commit 2fa96ee68dd2d576b19f5886c1bff40f9e64040f
Merge: 0c4c31625b 73b068d87e
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Fri Oct 4 17:27:13 2024 +0000

    Merge branch '2.1' into 3.1

 core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)