Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 59666180E9 for ; Sat, 3 Oct 2015 22:18:15 +0000 (UTC) Received: (qmail 71425 invoked by uid 500); 3 Oct 2015 22:18:15 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 71318 invoked by uid 500); 3 Oct 2015 22:18:15 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 71222 invoked by uid 99); 3 Oct 2015 22:18:15 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 03 Oct 2015 22:18:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A5C3AE0260; Sat, 3 Oct 2015 22:18:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Sat, 03 Oct 2015 22:18:19 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/6] accumulo git commit: Merge branch '1.7' 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 Authored: Sat Oct 3 18:17:59 2015 -0400 Committer: Josh Elser 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(-) ----------------------------------------------------------------------