From commits-return-21951-archive-asf-public=cust-asf.ponee.io@accumulo.apache.org Wed Jul 11 00:12:46 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 EEAD5180663 for ; Wed, 11 Jul 2018 00:12:45 +0200 (CEST) Received: (qmail 40834 invoked by uid 500); 10 Jul 2018 22:12:45 -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 40816 invoked by uid 99); 10 Jul 2018 22:12:45 -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; Tue, 10 Jul 2018 22:12:45 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 72ABB81E57; Tue, 10 Jul 2018 22:12:44 +0000 (UTC) Date: Tue, 10 Jul 2018 22:12:44 +0000 To: , "' commits@accumulo.apache.org" , '@gitbox.apache.org, Subject: [accumulo] branch master updated (5e5c74f -> 147e6ce) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <153126076438.15255.4011869162937867870@gitbox.apache.org> From: kturner@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: accumulo X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 5e5c74f3f11aa65ce8f1643f03c0e4efbbd1d0b3 X-Git-Newrev: 147e6ce0790f400572059eb1a22e5a3c60b429b1 X-Git-NotificationType: ref_changed X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. kturner pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git. from 5e5c74f Merge branch 'ACCUMULO-4074-2' add 42a3534 Fix multiple concurrency bugs in Master.gatherTableInformation() (#546) new 147e6ce Merge branch '1.9' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/accumulo/core/conf/Property.java | 5 +-- .../java/org/apache/accumulo/master/Master.java | 36 ++++++++++++++++------ 2 files changed, 29 insertions(+), 12 deletions(-)