[accumulo] branch main updated (b7d00d068f -> 10234edfb3)

[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 b7d00d068f Merge branch '2.1'
     add 15304598b9 Wire up FSDataInputStream.setDropBehind, set to true in FileCompactor (#3079)
     new 10234edfb3 Merge branch '2.1'

The 1 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:
 .../apache/accumulo/core/file/FileOperations.java  | 26 +++++++++++++++++-----
 .../file/blockfile/impl/CachableBlockFile.java     | 23 ++++++++++++++++++-
 .../accumulo/core/file/rfile/RFileOperations.java  | 10 ++++-----
 .../accumulo/server/compaction/FileCompactor.java  |  3 ++-
 .../org/apache/accumulo/tserver/log/DfsLogger.java |  4 +++-
 .../org/apache/accumulo/tserver/log/LogSorter.java |  4 +++-
 6 files changed, 56 insertions(+), 14 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 10234edfb34c1f9721b7fef721fb9e35631ee8be
Merge: b7d00d068f 15304598b9
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Thu Nov 17 00:13:19 2022 -0500

    Merge branch '2.1'

 .../apache/accumulo/core/file/FileOperations.java  | 26 +++++++++++++++++-----
 .../file/blockfile/impl/CachableBlockFile.java     | 23 ++++++++++++++++++-
 .../accumulo/core/file/rfile/RFileOperations.java  | 10 ++++-----
 .../accumulo/server/compaction/FileCompactor.java  |  3 ++-
 .../org/apache/accumulo/tserver/log/DfsLogger.java |  4 +++-
 .../org/apache/accumulo/tserver/log/LogSorter.java |  4 +++-
 6 files changed, 56 insertions(+), 14 deletions(-)