This is an automated email from the ASF dual-hosted git repository. dlmarion pushed a change to branch 3.1 in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 4bd6deaac2 Merge branch '2.1' into 3.1 add 9e40a1e068 Replaced tserv block cache mgr property with a more general one (#5231) new 19a4ebc030 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: .../main/java/org/apache/accumulo/core/conf/Property.java | 10 ++++++++-- .../blockfile/cache/impl/BlockCacheManagerFactory.java | 10 ++++++++-- .../core/file/blockfile/cache/BlockCacheFactoryTest.java | 4 ++-- .../core/file/blockfile/cache/TestLruBlockCache.java | 14 +++++++------- .../apache/accumulo/core/file/rfile/AbstractRFileTest.java | 2 +- .../org/apache/accumulo/core/file/rfile/RFileTest.java | 2 +- 6 files changed, 27 insertions(+), 15 deletions(-)