(accumulo) 01/01: Merge remote-tracking branch 'upstream/3.1'

[kturner]

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

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

commit 7fb0730d54cbd1a78ce2cfc794b8aa35f36297d5
Merge: 0295dc87de 2b8fc0c488
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Mon Sep 23 17:23:27 2024 +0000

    Merge remote-tracking branch 'upstream/3.1'

 core/src/main/java/org/apache/accumulo/core/conf/Property.java |  8 +++-----
 .../core/file/blockfile/cache/lru/LruBlockCacheManager.java    |  2 ++
 .../core/file/blockfile/cache/BlockCacheFactoryTest.java       |  1 +
 .../accumulo/core/file/blockfile/cache/TestLruBlockCache.java  |  1 +
 .../org/apache/accumulo/core/file/rfile/AbstractRFileTest.java | 10 +++++-----
 .../java/org/apache/accumulo/core/file/rfile/RFileTest.java    |  4 ++--
 6 files changed, 14 insertions(+), 12 deletions(-)

diff --cc core/src/main/java/org/apache/accumulo/core/conf/Property.java
index 1947ea376e,eb2ffbfd6d..a6d7898a00
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@@ -28,9 -28,9 +28,10 @@@ import java.util.HashSet
  import java.util.Objects;
  import java.util.function.Predicate;
  
 +import org.apache.accumulo.core.Constants;
  import org.apache.accumulo.core.classloader.ClassLoaderUtil;
  import org.apache.accumulo.core.data.constraints.NoDeleteConstraint;
+ import 
org.apache.accumulo.core.file.blockfile.cache.tinylfu.TinyLfuBlockCacheManager;
  import org.apache.accumulo.core.file.rfile.RFile;
  import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
  import org.apache.accumulo.core.iteratorsImpl.system.DeletingIterator;