From commits-return-22971-archive-asf-public=cust-asf.ponee.io@accumulo.apache.org Mon Jun 10 01:18:49 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 7358918067A for ; Mon, 10 Jun 2019 03:18:49 +0200 (CEST) Received: (qmail 54673 invoked by uid 500); 10 Jun 2019 01:18:48 -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 54643 invoked by uid 99); 10 Jun 2019 01:18:48 -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; Mon, 10 Jun 2019 01:18:48 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 955D987A87; Mon, 10 Jun 2019 01:18:48 +0000 (UTC) Date: Mon, 10 Jun 2019 01:18:52 +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: <156012952825.1359.10553438098802650292@gitbox.apache.org> References: <156012952825.1359.10553438098802650292@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: cda3be981ea42dead5eeff0374590337f7b76c93 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20190610011848.955D987A87@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 cda3be981ea42dead5eeff0374590337f7b76c93 Merge: 2cd5b4c 68f8f5e Author: Christopher Tubbs AuthorDate: Sun Jun 9 21:18:10 2019 -0400 Merge branch '2.0' .../mapreduce/lib/partition/RangePartitioner.java | 50 +++++-------- .../clientImpl/mapreduce/lib/ConfiguratorBase.java | 85 ++++++++++------------ .../mapreduce/lib/DistributedCacheHelper.java | 59 +++++++++++++-- .../mapreduce/partition/RangePartitioner.java | 50 +++++-------- .../hadoopImpl/mapreduce/lib/ConfiguratorBase.java | 39 ++++------ .../org/apache/accumulo/shell/ShellOptionsJC.java | 4 +- .../accumulo/shell/PasswordConverterTest.java | 3 +- .../apache/accumulo/test/mapred/TokenFileIT.java | 15 +++- .../accumulo/test/mapreduce/TokenFileIT.java | 29 +++++++- 9 files changed, 189 insertions(+), 145 deletions(-)