This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch single-node-props
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 13e8d9e3c3b78dae7be88baeeccbab501bda44f5
Merge: f336894433 39bc7a0524
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Thu Apr 28 17:33:14 2022 -0400
Merge branch 'main' into single-node-props
.../system/SourceSwitchingIterator.java | 2 +
.../accumulo/tserver/TabletClientHandler.java | 10 +-
.../accumulo/tserver/TabletHostingServer.java | 57 +++
.../org/apache/accumulo/tserver/TabletServer.java | 27 +-
.../accumulo/tserver/ThriftScanClientHandler.java | 51 +--
.../apache/accumulo/tserver/scan/LookupTask.java | 4 +-
.../accumulo/tserver/scan/NextBatchTask.java | 4 +-
.../org/apache/accumulo/tserver/scan/ScanTask.java | 6 +-
.../accumulo/tserver/tablet/ScanDataSource.java | 33 +-
.../apache/accumulo/tserver/tablet/Scanner.java | 8 +-
.../org/apache/accumulo/tserver/tablet/Tablet.java | 455 +++-----------------
.../apache/accumulo/tserver/tablet/TabletBase.java | 462 +++++++++++++++++++++
12 files changed, 670 insertions(+), 449 deletions(-)
