Return-Path: <commits-return-19307-archive-asf-public=cust-asf.ponee.io@accumulo.apache.org>
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 B357D200BB2
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Fri, 23 Sep 2016 16:53:48 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id B22F9160ACF; Fri, 23 Sep 2016 14:53:48 +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 DF17E160AE4
	for <archive-asf-public@cust-asf.ponee.io>; Fri, 23 Sep 2016 16:53:47 +0200 (CEST)
Received: (qmail 70281 invoked by uid 500); 23 Sep 2016 14:53:47 -0000
Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@accumulo.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@accumulo.apache.org>
List-Post: <mailto:commits@accumulo.apache.org>
List-Id: <commits.accumulo.apache.org>
Reply-To: dev@accumulo.apache.org
Delivered-To: mailing list commits@accumulo.apache.org
Received: (qmail 70159 invoked by uid 99); 23 Sep 2016 14:53:47 -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; Fri, 23 Sep 2016 14:53:46 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id B7DE2E08AD; Fri, 23 Sep 2016 14:53:46 +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: Fri, 23 Sep 2016 14:53:51 -0000
Message-Id: <498b6512792245ffa3346632db5ac3f4@git.apache.org>
In-Reply-To: <2e89afe86422434ab018a98c53c16171@git.apache.org>
References: <2e89afe86422434ab018a98c53c16171@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [6/6] accumulo git commit: Merge branch '1.8'
archived-at: Fri, 23 Sep 2016 14:53:48 -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/ab2a93ad
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ab2a93ad
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ab2a93ad

Branch: refs/heads/master
Commit: ab2a93adaec3ec14d5b3c34d33fbeebb144c8aea
Parents: 0bf8f8e 33f7301
Author: Josh Elser <elserj@apache.org>
Authored: Fri Sep 23 10:53:28 2016 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Fri Sep 23 10:53:28 2016 -0400

----------------------------------------------------------------------
 .../apache/accumulo/core/cli/ClientOpts.java    | 37 ++++++++++++++++----
 .../accumulo/core/cli/TestClientOpts.java       | 12 ++++---
 .../org/apache/accumulo/server/util/Admin.java  | 14 +-------
 3 files changed, 39 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab2a93ad/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
index a73da7b,362bad9..57f8774
--- a/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
+++ b/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
@@@ -57,7 -56,10 +57,9 @@@ import org.apache.log4j.Logger
  import com.beust.jcommander.DynamicParameter;
  import com.beust.jcommander.IStringConverter;
  import com.beust.jcommander.Parameter;
 -import com.google.common.base.Predicate;
  
+ import jline.console.ConsoleReader;
+ 
  public class ClientOpts extends Help {
  
    public static class TimeConverter implements IStringConverter<Long> {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab2a93ad/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
----------------------------------------------------------------------