From commits-return-22018-archive-asf-public=cust-asf.ponee.io@accumulo.apache.org Wed Aug 1 21:44:08 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 58C29180662 for ; Wed, 1 Aug 2018 21:44:08 +0200 (CEST) Received: (qmail 89927 invoked by uid 500); 1 Aug 2018 19:44:07 -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 89917 invoked by uid 99); 1 Aug 2018 19:44:07 -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, 01 Aug 2018 19:44:07 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id E1625807EC; Wed, 1 Aug 2018 19:44:06 +0000 (UTC) Date: Wed, 01 Aug 2018 19:44:07 +0000 To: "commits@accumulo.apache.org" Subject: [accumulo] 01/01: Merge branch '1.9' MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: mmiller@apache.org In-Reply-To: <153315264679.8972.10954430171211921240@gitbox.apache.org> References: <153315264679.8972.10954430171211921240@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: d627908151eaf1c04fb6ac68d1d9490e1c7046e1 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20180801194406.E1625807EC@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. mmiller pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git commit d627908151eaf1c04fb6ac68d1d9490e1c7046e1 Merge: 02eaab9 7fd1f78 Author: Mike Miller AuthorDate: Wed Aug 1 15:36:03 2018 -0400 Merge branch '1.9' Conflicts: core/src/main/java/org/apache/accumulo/core/iterators/system/VisibilityFilter.java .../apache/accumulo/core/iterators/system/VisibilityFilter.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)