This is an automated email from the ASF dual-hosted git repository. kturner pushed a commit to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit cdaac866da85449227864caabc52fc00ee83fe56 Merge: ef34a4890a 861d28b64b Author: Keith Turner <ktur...@apache.org> AuthorDate: Fri May 10 18:20:33 2024 -0400 Merge remote-tracking branch 'upstream/main' into elasticity .../java/org/apache/accumulo/core/client/rfile/RFileScanner.java | 5 +++++ .../accumulo/core/file/blockfile/cache/lru/LruBlockCache.java | 5 +++++ .../core/file/blockfile/cache/tinylfu/TinyLfuBlockCache.java | 5 +++++ .../java/org/apache/accumulo/core/metrics/MetricsProducer.java | 4 ++++ .../main/java/org/apache/accumulo/core/spi/cache/BlockCache.java | 7 +++++++ .../main/java/org/apache/accumulo/tserver/BlockCacheMetrics.java | 8 ++++++++ .../java/org/apache/accumulo/test/manager/SuspendedTabletsIT.java | 3 +++ 7 files changed, 37 insertions(+)