From commits-return-22138-archive-asf-public=cust-asf.ponee.io@accumulo.apache.org Sat Sep 22 00:17:27 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 EBEEA180677 for ; Sat, 22 Sep 2018 00:17:26 +0200 (CEST) Received: (qmail 96535 invoked by uid 500); 21 Sep 2018 22:17:26 -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 96513 invoked by uid 99); 21 Sep 2018 22:17:26 -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; Fri, 21 Sep 2018 22:17:26 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 809CA82F1C; Fri, 21 Sep 2018 22:17:25 +0000 (UTC) Date: Fri, 21 Sep 2018 22:17:27 +0000 To: "commits@accumulo.apache.org" Subject: [accumulo] 03/03: Merge branch 'document-api' closes #656 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: kturner@apache.org In-Reply-To: <153756824483.32454.8549531896292386753@gitbox.apache.org> References: <153756824483.32454.8549531896292386753@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: d55ce357b9f7555cef6c91cbe93b94de26b58d88 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20180921221725.809CA82F1C@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. kturner pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git commit d55ce357b9f7555cef6c91cbe93b94de26b58d88 Merge: b408783 c1ecab2 Author: Keith Turner AuthorDate: Fri Sep 21 17:54:53 2018 -0400 Merge branch 'document-api' closes #656 README.md | 28 +----- .../core/client/mapred/AbstractInputFormat.java | 2 +- .../core/client/mapred/AccumuloOutputFormat.java | 2 +- .../core/client/mapreduce/AbstractInputFormat.java | 2 +- .../client/mapreduce/AccumuloOutputFormat.java | 2 +- .../mapreduce/lib/impl/ConfiguratorBase.java | 2 +- .../mapreduce/lib/impl/MapReduceClientOpts.java | 2 +- .../mapreduce/lib/impl/ConfiguratorBaseTest.java | 2 +- .../java/org/apache/accumulo/core/Accumulo.java | 43 --------- .../org/apache/accumulo/core/cli/ClientOpts.java | 2 +- .../org/apache/accumulo/core/client/Accumulo.java | 105 +++++++++++++++++++++ .../accumulo/core/client/AccumuloClient.java | 7 +- .../accumulo/core/client/ClientConfiguration.java | 1 - .../apache/accumulo/core/client/ClientInfo.java | 1 - .../org/apache/accumulo/core/client/Instance.java | 1 - .../accumulo/core/client/ZooKeeperInstance.java | 1 - .../standalone/StandaloneAccumuloCluster.java | 2 +- .../accumulo/minicluster/MiniAccumuloCluster.java | 2 +- pom.xml | 1 + .../main/java/org/apache/accumulo/shell/Shell.java | 2 +- .../StandaloneAccumuloClusterConfiguration.java | 2 +- .../apache/accumulo/test/BatchWriterIterator.java | 2 +- .../org/apache/accumulo/test/IMMLGBenchmark.java | 2 +- .../org/apache/accumulo/test/ShellServerIT.java | 2 +- .../accumulo/test/functional/AccumuloClientIT.java | 2 +- .../test/functional/ConfigurableMacBase.java | 2 +- .../accumulo/test/functional/ReadWriteIT.java | 2 +- .../test/mapred/AccumuloOutputFormatIT.java | 2 +- 28 files changed, 131 insertions(+), 95 deletions(-)