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/04e91398 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/04e91398 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/04e91398 Branch: refs/heads/master Commit: 04e91398b894768d053a4bc237e23285aaac5d34 Parents: 8f52ab2 071c507 Author: Josh Elser <els...@apache.org> Authored: Sat Oct 24 17:04:08 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Sat Oct 24 17:04:08 2015 -0400 ---------------------------------------------------------------------- assemble/bin/bootstrap_config.sh | 29 +++++++++++++++++++- assemble/conf/templates/accumulo-site.xml | 9 ++++++ .../accumulo/gc/GarbageCollectionAlgorithm.java | 5 ++-- 3 files changed, 39 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/04e91398/assemble/bin/bootstrap_config.sh ----------------------------------------------------------------------
