From commits-return-21509-archive-asf-public=cust-asf.ponee.io@accumulo.apache.org Wed Feb 21 18:15:38 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 48FBC18067E for ; Wed, 21 Feb 2018 18:15:38 +0100 (CET) Received: (qmail 79915 invoked by uid 500); 21 Feb 2018 17:15:37 -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 79899 invoked by uid 99); 21 Feb 2018 17:15:37 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Feb 2018 17:15:37 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id C261C83169; Wed, 21 Feb 2018 17:15:36 +0000 (UTC) Date: Wed, 21 Feb 2018 17:15:37 +0000 To: "commits@accumulo.apache.org" Subject: [accumulo] 01/01: Merge branch '1.8' MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: kturner@apache.org In-Reply-To: <151923333667.19016.4299317023779675864@gitbox.apache.org> References: <151923333667.19016.4299317023779675864@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: accumulo X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: f3242f1d83494a4685bf74d12e1c200ea7fb508f X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20180221171536.C261C83169@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. kturner pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git commit f3242f1d83494a4685bf74d12e1c200ea7fb508f Merge: a589e6a fb72991 Author: Keith Turner AuthorDate: Wed Feb 21 12:12:18 2018 -0500 Merge branch '1.8' .../org/apache/accumulo/tserver/FileManager.java | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact kturner@apache.org.