This is an automated email from the ASF dual-hosted git repository.
kturner pushed a change to branch 3.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 875f5e72b7 Merge remote-tracking branch 'upstream/2.1' into 3.1
add f3b7a300a4 adapts new scan session tests to also run on scan servers
(#4844)
add 26bc040ed1 lowers memory burden of listing external compactions in
monitor (#4867)
add ae94980767 fixes nanoTime bug in Monitor (#4884)
add e981057599 adds detailed trace logging for block caches (#4872)
new f3531d8c26 Merge branch '2.1' into 3.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:
.../core/client/admin/InstanceOperations.java | 1 +
.../file/blockfile/impl/ScanCacheProvider.java | 19 +--
.../accumulo/core/logging/LoggingBlockCache.java | 131 +++++++++++++++++++++
.../accumulo/core/summary/SummaryReader.java | 6 +-
.../java/org/apache/accumulo/monitor/Monitor.java | 60 +++++++---
.../rest/compactions/external/ECResource.java | 17 +--
.../accumulo/tserver/tablet/SnapshotTablet.java | 15 +--
.../org/apache/accumulo/tserver/tablet/Tablet.java | 9 --
.../apache/accumulo/tserver/tablet/TabletBase.java | 9 ++
src/build/ci/find-unapproved-chars.sh | 2 +-
.../org/apache/accumulo/test/CloseScannerIT.java | 9 +-
.../org/apache/accumulo/test/ZombieScanIT.java | 61 +++++++---
.../test/functional/ScanSessionTimeOutIT.java | 11 +-
.../apache/accumulo/test/functional/ScannerIT.java | 71 ++++++++---
14 files changed, 322 insertions(+), 99 deletions(-)
create mode 100644
core/src/main/java/org/apache/accumulo/core/logging/LoggingBlockCache.java
