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 44DD0200CF7 for ; Mon, 24 Jul 2017 23:26:41 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 43E261655F6; Mon, 24 Jul 2017 21:26:41 +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 586A31655E0 for ; Mon, 24 Jul 2017 23:26:40 +0200 (CEST) Received: (qmail 92411 invoked by uid 500); 24 Jul 2017 21:26:39 -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 92187 invoked by uid 99); 24 Jul 2017 21:26:38 -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; Mon, 24 Jul 2017 21:26:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3E781EE68A; Mon, 24 Jul 2017 21:26:36 +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: Mon, 24 Jul 2017 21:26:40 -0000 Message-Id: In-Reply-To: <796648929a37498998c5badd91369872@git.apache.org> References: <796648929a37498998c5badd91369872@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/9] accumulo git commit: Merge branch '1.7' into 1.8 archived-at: Mon, 24 Jul 2017 21:26:41 -0000 Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/62d43cbe Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/62d43cbe Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/62d43cbe Branch: refs/heads/master Commit: 62d43cbe4902eaaf46768bbe5f75020ac5a54682 Parents: 6c21a8f f78a5d9 Author: Christopher Tubbs Authored: Mon Jul 24 16:25:16 2017 -0400 Committer: Christopher Tubbs Committed: Mon Jul 24 16:25:16 2017 -0400 ---------------------------------------------------------------------- .../src/test/java/org/apache/accumulo/server/fs/FileRefTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------