Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c044127a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c044127a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c044127a Branch: refs/heads/1.8 Commit: c044127a98a47707d10f55a2c4b28d86d5642a2d Parents: ce7c1fa 160e2c7 Author: Dave Marion <dlmar...@apache.org> Authored: Thu May 5 13:41:38 2016 -0400 Committer: Dave Marion <dlmar...@apache.org> Committed: Thu May 5 13:41:38 2016 -0400 ---------------------------------------------------------------------- assemble/bin/config.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) ----------------------------------------------------------------------