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/97209ba5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/97209ba5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/97209ba5 Branch: refs/heads/master Commit: 97209ba54547cdc93722c0d7a8c7bce28f4ab0f7 Parents: 45d73b1 30d065d Author: Josh Elser <els...@apache.org> Authored: Mon Aug 15 18:01:03 2016 -0400 Committer: Josh Elser <els...@apache.org> Committed: Mon Aug 15 18:01:03 2016 -0400 ---------------------------------------------------------------------- assemble/bin/accumulo | 15 +++++++++++---- assemble/bin/config.sh | 10 +++++++--- assemble/bin/start-daemon.sh | 11 ++++++++++- assemble/conf/templates/generic_logger.properties | 4 ++-- assemble/conf/templates/generic_logger.xml | 4 ++-- 5 files changed, 32 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
