Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/647cfb74 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/647cfb74 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/647cfb74 Branch: refs/heads/master Commit: 647cfb74f25c8174c8526d8e83fd3fd6c6dac64c Parents: 5a2396e 8532f07 Author: Josh Elser <els...@apache.org> Authored: Sat Oct 3 18:17:59 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Sat Oct 3 18:17:59 2015 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/core/file/blockfile/cache/BlockCache.java | 2 -- .../org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java | 2 -- .../accumulo/core/file/blockfile/cache/CachedBlockQueue.java | 2 -- .../org/apache/accumulo/core/file/blockfile/cache/ClassSize.java | 2 -- .../org/apache/accumulo/core/file/blockfile/cache/HeapSize.java | 2 -- .../apache/accumulo/core/file/blockfile/cache/LruBlockCache.java | 2 -- .../accumulo/core/file/blockfile/cache/TestCachedBlockQueue.java | 2 -- .../accumulo/core/file/blockfile/cache/TestLruBlockCache.java | 2 -- 8 files changed, 16 deletions(-) ----------------------------------------------------------------------
