This is an automated email from the ASF dual-hosted git repository.
wchevreuil pushed a change to branch HBASE-27389-master-rebase
in repository https://gitbox.apache.org/repos/asf/hbase.git
from 917bfce71e8 Merge branch 'HBASE-27389' into HBASE-27389-master-rebase
add 02fdc7d4aa3 HBASE-27389 rebase - Resolving conflicts
No new revisions were added by this update.
Summary of changes:
.../src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCache.java | 3 ++-
.../java/org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.java | 3 ++-
.../java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java | 5 +++--
3 files changed, 7 insertions(+), 4 deletions(-)
