Merge branch 'ACCUMULO-4463' into IGNITE
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c4a18a63 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c4a18a63 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c4a18a63 Branch: refs/heads/IGNITE Commit: c4a18a63ee97b58602bec3f57ba0cf16d597f7db Parents: 2e992c8 e8ccddd Author: Dave Marion <dlmar...@apache.org> Authored: Thu May 18 15:37:11 2017 -0400 Committer: Dave Marion <dlmar...@apache.org> Committed: Thu May 18 15:37:11 2017 -0400 ---------------------------------------------------------------------- .../cache/BlockCacheConfiguration.java | 55 +++--------- .../cache/lru/LruBlockCacheConfiguration.java | 90 ++++++++++++++++++-- .../cache/BlockConfigurationHelperTest.java | 16 +--- .../file/blockfile/cache/TestLruBlockCache.java | 64 +++++++------- 4 files changed, 133 insertions(+), 92 deletions(-) ----------------------------------------------------------------------