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/6fae53cb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6fae53cb Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6fae53cb Branch: refs/heads/master Commit: 6fae53cbec14e4a06a0897e9385f4cb9330362b9 Parents: 2bf55dc cd43958 Author: Mike Miller <mmil...@apache.org> Authored: Tue Nov 8 14:56:05 2016 -0500 Committer: Mike Miller <mmil...@apache.org> Committed: Tue Nov 8 14:56:05 2016 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/server/init/Initialize.java | 3 ++- shell/src/main/java/org/apache/accumulo/shell/Shell.java | 3 +-- .../main/java/org/apache/accumulo/shell/ShellOptionsJC.java | 7 +++++++ 3 files changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/6fae53cb/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java ----------------------------------------------------------------------
