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/5a18575d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5a18575d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5a18575d Branch: refs/heads/master Commit: 5a18575d25cd2df25805b60d9b52a88e21c6aa63 Parents: 3020c18 dba4447 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Thu Mar 9 20:09:47 2017 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Thu Mar 9 20:09:47 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/5a18575d/shell/src/main/java/org/apache/accumulo/shell/Shell.java ----------------------------------------------------------------------
