You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2017/03/10 01:10:21 UTC
[3/5] accumulo git commit: Merge branch '1.7' into 1.8
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/dba44475
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dba44475
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dba44475
Branch: refs/heads/master
Commit: dba444757eb2ae9732f2764e713e273ce703297f
Parents: 7ca6332 8037355
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Mar 9 20:08:44 2017 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Mar 9 20:08:44 2017 -0500
----------------------------------------------------------------------
.../java/org/apache/accumulo/shell/Shell.java | 10 ++++---
.../apache/accumulo/shell/ShellConfigTest.java | 25 ++++++-----------
shell/src/test/resources/accumulo-site.xml | 28 ++++++++++++++++++++
3 files changed, 42 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/dba44475/shell/src/main/java/org/apache/accumulo/shell/Shell.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/dba44475/shell/src/test/java/org/apache/accumulo/shell/ShellConfigTest.java
----------------------------------------------------------------------
diff --cc shell/src/test/java/org/apache/accumulo/shell/ShellConfigTest.java
index 8bef14d,7b9f72f..1e72293
--- a/shell/src/test/java/org/apache/accumulo/shell/ShellConfigTest.java
+++ b/shell/src/test/java/org/apache/accumulo/shell/ShellConfigTest.java
@@@ -25,9 -25,8 +25,7 @@@ import java.io.FileDescriptor
import java.io.FileInputStream;
import java.io.IOException;
import java.io.PrintStream;
-import java.io.PrintWriter;
import java.nio.file.Files;
- import java.util.HashMap;
- import java.util.Map;
import jline.console.ConsoleReader;