Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8C673200B72 for ; Fri, 22 Jul 2016 04:58:57 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 8B412160A7C; Fri, 22 Jul 2016 02:58:57 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 6280B160A97 for ; Fri, 22 Jul 2016 04:58:56 +0200 (CEST) Received: (qmail 75768 invoked by uid 500); 22 Jul 2016 02:58:55 -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 75332 invoked by uid 99); 22 Jul 2016 02:58:55 -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; Fri, 22 Jul 2016 02:58:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 32633E93E5; Fri, 22 Jul 2016 02:58:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Date: Fri, 22 Jul 2016 02:59:05 -0000 Message-Id: <9bab0adacecd4cf686336cf4127eebab@git.apache.org> In-Reply-To: <8930e8a27601403ca60b6d8ca8e92dd7@git.apache.org> References: <8930e8a27601403ca60b6d8ca8e92dd7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [11/16] accumulo git commit: Merge branch '1.6' into 1.7 archived-at: Fri, 22 Jul 2016 02:58:57 -0000 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/98228607 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/98228607 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/98228607 Branch: refs/heads/master Commit: 98228607909747115fd1c16f1561f153e135913c Parents: 7109640 dcc5dff Author: Christopher Tubbs Authored: Thu Jul 21 22:32:41 2016 -0400 Committer: Christopher Tubbs Committed: Thu Jul 21 22:32:41 2016 -0400 ---------------------------------------------------------------------- .../accumulo/core/file/blockfile/impl/CachableBlockFile.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/98228607/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java ----------------------------------------------------------------------