Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3a8f620d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3a8f620d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3a8f620d Branch: refs/heads/master Commit: 3a8f620d85533964cd2abc8060f42988260069ee Parents: 2ba701e 8d6a4cf Author: Christopher Tubbs <ctubb...@apache.org> Authored: Mon Apr 7 15:50:14 2014 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Mon Apr 7 15:50:14 2014 -0400 ---------------------------------------------------------------------- assemble/src/main/assemblies/component.xml | 3 + bin/bootstrap_config.sh | 321 ++++++++++++++++++++---- conf/templates/accumulo-env.sh | 66 +++++ conf/templates/accumulo-metrics.xml | 60 +++++ conf/templates/accumulo-site.xml | 132 ++++++++++ conf/templates/accumulo.policy.example | 143 +++++++++++ conf/templates/auditLog.xml | 35 +++ conf/templates/gc | 16 ++ conf/templates/generic_logger.xml | 83 ++++++ conf/templates/log4j.properties | 41 +++ conf/templates/masters | 16 ++ conf/templates/monitor | 16 ++ conf/templates/monitor_logger.xml | 64 +++++ conf/templates/slaves | 16 ++ conf/templates/tracers | 16 ++ 15 files changed, 985 insertions(+), 43 deletions(-) ----------------------------------------------------------------------
