Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 2477E200AE4 for ; Wed, 11 May 2016 01:55:42 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 2349B160A16; Tue, 10 May 2016 23:55:42 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 6C1B5160A12 for ; Wed, 11 May 2016 01:55:41 +0200 (CEST) Received: (qmail 38425 invoked by uid 500); 10 May 2016 23:55:40 -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 38361 invoked by uid 99); 10 May 2016 23:55:40 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 May 2016 23:55:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 79D1FDFF73; Tue, 10 May 2016 23:55:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Date: Tue, 10 May 2016 23:55:42 -0000 Message-Id: <7d0fab49caa3487aa20003c5f6a3300a@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] accumulo git commit: Merge branch '1.8' archived-at: Tue, 10 May 2016 23:55:42 -0000 Merge branch '1.8' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6592bb12 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6592bb12 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6592bb12 Branch: refs/heads/master Commit: 6592bb122fb7ab827bca5c540e9969f4c1176015 Parents: e2856a4 73b4fbb Author: Christopher Tubbs Authored: Tue May 10 19:53:47 2016 -0400 Committer: Christopher Tubbs Committed: Tue May 10 19:53:47 2016 -0400 ---------------------------------------------------------------------- .../apache/accumulo/core/client/ScannerBase.java | 2 -- .../accumulo/core/client/ZooKeeperInstance.java | 1 - .../core/client/mapred/InputFormatBase.java | 1 - .../core/client/mapreduce/InputFormatBase.java | 1 - .../core/client/mapreduce/InputTableConfig.java | 1 - .../mapreduce/lib/impl/InputConfigurator.java | 1 - .../mapreduce/lib/util/InputConfigurator.java | 1 - .../accumulo/core/constraints/Constraint.java | 5 ----- .../org/apache/accumulo/core/data/Mutation.java | 3 --- .../accumulo/monitor/servlets/DefaultServlet.java | 2 +- .../org/apache/accumulo/test/ShellServerIT.java | 3 --- .../apache/accumulo/test/functional/ScanIdIT.java | 4 ++-- .../accumulo/test/util/SerializationUtil.java | 17 ----------------- 13 files changed, 3 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/6592bb12/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/6592bb12/test/src/main/java/org/apache/accumulo/test/util/SerializationUtil.java ----------------------------------------------------------------------