Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8532f075 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8532f075 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8532f075 Branch: refs/heads/master Commit: 8532f075938d8063364a066950d43dad520b9d66 Parents: 7b5ad53 c869751 Author: Josh Elser <els...@apache.org> Authored: Sat Oct 3 18:17:52 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Sat Oct 3 18:17:52 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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/8532f075/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/BlockCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/8532f075/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/8532f075/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlockQueue.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/8532f075/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/ClassSize.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/8532f075/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/HeapSize.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/8532f075/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/LruBlockCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/8532f075/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java ----------------------------------------------------------------------
