From commits-return-23476-archive-asf-public=cust-asf.ponee.io@accumulo.apache.org Thu Oct 10 19:01:20 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 BBA6E180658 for ; Thu, 10 Oct 2019 21:01:19 +0200 (CEST) Received: (qmail 322 invoked by uid 500); 10 Oct 2019 19:01:19 -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 265 invoked by uid 99); 10 Oct 2019 19:01:19 -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, 10 Oct 2019 19:01:19 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id DF453811CC; Thu, 10 Oct 2019 19:01:18 +0000 (UTC) Date: Thu, 10 Oct 2019 19:01:19 +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: mmiller@apache.org In-Reply-To: <157073407852.16032.5693352639387532387@gitbox.apache.org> References: <157073407852.16032.5693352639387532387@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: ee24511d5b7811b0aa048a9048f62a6a1ccd2f93 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20191010190118.DF453811CC@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 ee24511d5b7811b0aa048a9048f62a6a1ccd2f93 Merge: 85e818d aabe05c Author: Mike Miller AuthorDate: Thu Oct 10 15:00:51 2019 -0400 Merge branch '2.0' .../clientImpl/AccumuloBulkMergeException.java | 32 +++++++++++ .../core/clientImpl/TableOperationsImpl.java | 2 + .../accumulo/core/clientImpl/bulk/BulkImport.java | 64 ++++++++++++++++++---- .../thrift/TableOperationExceptionType.java | 5 +- core/src/main/thrift/client.thrift | 1 + .../master/tableOps/bulkVer2/PrepBulkImport.java | 7 +-- .../tableOps/bulkVer2/PrepBulkImportTest.java | 6 +- 7 files changed, 97 insertions(+), 20 deletions(-)