From commits-return-23010-archive-asf-public=cust-asf.ponee.io@accumulo.apache.org Thu Jun 13 21:17:29 2019 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 [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id E4C0B180780 for ; Thu, 13 Jun 2019 23:17:28 +0200 (CEST) Received: (qmail 89575 invoked by uid 500); 13 Jun 2019 21:17:28 -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 89503 invoked by uid 99); 13 Jun 2019 21:17:28 -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; Thu, 13 Jun 2019 21:17:28 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 2F08C87AD9; Thu, 13 Jun 2019 21:17:28 +0000 (UTC) Date: Thu, 13 Jun 2019 21:17:29 +0000 To: "commits@accumulo.apache.org" Subject: [accumulo] 01/01: Merge branch '2.0' MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: ctubbsii@apache.org In-Reply-To: <156046064788.18432.56456611283691502@gitbox.apache.org> References: <156046064788.18432.56456611283691502@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: 98f307b263f8fbc8cfbfde56d4fb9b4d4097e4d0 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20190613211728.2F08C87AD9@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git commit 98f307b263f8fbc8cfbfde56d4fb9b4d4097e4d0 Merge: 09312c0 87639a3 Author: Christopher Tubbs AuthorDate: Thu Jun 13 17:17:00 2019 -0400 Merge branch '2.0' .../java/org/apache/accumulo/core/conf/Property.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)