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 4BAB1200C76 for ; Sat, 8 Apr 2017 02:08:40 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 4A851160B97; Sat, 8 Apr 2017 00:08:40 +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 8624D160BA2 for ; Sat, 8 Apr 2017 02:08:39 +0200 (CEST) Received: (qmail 43108 invoked by uid 500); 8 Apr 2017 00:08:38 -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 43088 invoked by uid 99); 8 Apr 2017 00:08:38 -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; Sat, 08 Apr 2017 00:08:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9E5A1E038D; Sat, 8 Apr 2017 00:08:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kturner@apache.org To: commits@accumulo.apache.org Date: Sat, 08 Apr 2017 00:08:39 -0000 Message-Id: <7f4965186f174b10a83a333a005a483b@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/3] accumulo git commit: Merge branch '1.7' into 1.8 archived-at: Sat, 08 Apr 2017 00:08:40 -0000 Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ba3dea16 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ba3dea16 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ba3dea16 Branch: refs/heads/master Commit: ba3dea165b42c3150eed60489ee8a8b98c8b47be Parents: 8d6b729 8c0f03a Author: Keith Turner Authored: Fri Apr 7 19:03:49 2017 -0400 Committer: Keith Turner Committed: Fri Apr 7 19:03:49 2017 -0400 ---------------------------------------------------------------------- .../core/client/impl/TableOperationsImpl.java | 39 +++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/ba3dea16/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java ----------------------------------------------------------------------