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/35ab8cef Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/35ab8cef Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/35ab8cef Branch: refs/heads/master Commit: 35ab8cef050ab870207711d8186e591d982e3d14 Parents: f7481b4 60591c8 Author: Dave Marion <dlmar...@apache.org> Authored: Wed Jun 8 08:22:23 2016 -0400 Committer: Dave Marion <dlmar...@apache.org> Committed: Wed Jun 8 08:22:23 2016 -0400 ---------------------------------------------------------------------- assemble/bin/accumulo | 15 ++++- assemble/bin/config.sh | 14 ++++ assemble/bin/start-daemon.sh | 71 +++++++++++++++----- assemble/bin/stop-server.sh | 25 ++++--- assemble/conf/templates/accumulo-env.sh | 12 ++++ assemble/conf/templates/generic_logger.xml | 4 +- .../main/asciidoc/chapters/administration.txt | 49 ++++++-------- 7 files changed, 130 insertions(+), 60 deletions(-) ----------------------------------------------------------------------
