[accumulo] branch main updated (89b972c643 -> 9d9e17868e)

[ct...@apache.org]

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

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


    from 89b972c643 Merge branch '2.1'
     add b37b0626b6 fix parameter check and minor variable rename (#3176)
     new 895479eb08 Merge branch '1.10' into 2.1
     new 9d9e17868e Merge branch '2.1'

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../core/client/ClientSideIteratorScanner.java     |  8 +++----
 .../accumulo/core/client/IsolatedScanner.java      |  8 +++----
 .../accumulo/core/clientImpl/ScannerIterator.java  |  2 +-
 .../accumulo/core/clientImpl/ScannerOptions.java   | 26 +++++++++++-----------
 .../core/clientImpl/TabletServerBatchReader.java   |  2 +-
 .../TabletServerBatchReaderIterator.java           | 12 +++++-----
 6 files changed, 29 insertions(+), 29 deletions(-)

[accumulo] 01/01: Merge branch '2.1'

[ct...@apache.org]

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 9d9e17868ea06d39853b1b4f11808d486a1cf7f9
Merge: 89b972c643 895479eb08
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Wed Feb 8 12:45:38 2023 -0500

    Merge branch '2.1'

 .../core/client/ClientSideIteratorScanner.java     |  8 +++----
 .../accumulo/core/client/IsolatedScanner.java      |  8 +++----
 .../accumulo/core/clientImpl/ScannerIterator.java  |  2 +-
 .../accumulo/core/clientImpl/ScannerOptions.java   | 26 +++++++++++-----------
 .../core/clientImpl/TabletServerBatchReader.java   |  2 +-
 .../TabletServerBatchReaderIterator.java           | 12 +++++-----
 6 files changed, 29 insertions(+), 29 deletions(-)