accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [6/6] accumulo git commit: Merge branch '1.8'
Date Fri, 23 Sep 2016 14:53:51 GMT
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
----------------------------------------------------------------------


Mime
View raw message