Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 194DD18142 for ; Thu, 31 Dec 2015 02:15:55 +0000 (UTC) Received: (qmail 96116 invoked by uid 500); 31 Dec 2015 02:15:55 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 96085 invoked by uid 500); 31 Dec 2015 02:15:55 -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 95917 invoked by uid 99); 31 Dec 2015 02:15:55 -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; Thu, 31 Dec 2015 02:15:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9F0F3E0BB0; Thu, 31 Dec 2015 02:15:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Thu, 31 Dec 2015 02:15:59 -0000 Message-Id: <9d31cce92a2045aeb691e998ff6471e1@git.apache.org> In-Reply-To: <61972b654d2941c6b102767a943eee56@git.apache.org> References: <61972b654d2941c6b102767a943eee56@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/6] accumulo git commit: Merge branch '1.7' Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9290ed3c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9290ed3c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9290ed3c Branch: refs/heads/master Commit: 9290ed3c5a88bb16a92980596c36ec27d1c3f619 Parents: 485c923 acf68ad Author: Josh Elser Authored: Wed Dec 30 21:15:34 2015 -0500 Committer: Josh Elser Committed: Wed Dec 30 21:15:34 2015 -0500 ---------------------------------------------------------------------- .../accumulo/core/client/admin/TableOperations.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/9290ed3c/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java ----------------------------------------------------------------------