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/4c4ad866 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4c4ad866 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4c4ad866 Branch: refs/heads/1.8 Commit: 4c4ad86645336d84cbe4ca4ef75e6e0f03d58e6a Parents: 757dedf 196b6bd Author: Josh Elser <els...@apache.org> Authored: Mon Jul 11 15:48:07 2016 -0400 Committer: Josh Elser <els...@apache.org> Committed: Mon Jul 11 15:48:07 2016 -0400 ---------------------------------------------------------------------- shell/src/main/java/org/apache/accumulo/shell/Shell.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/4c4ad866/shell/src/main/java/org/apache/accumulo/shell/Shell.java ----------------------------------------------------------------------