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/27abe835 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/27abe835 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/27abe835 Branch: refs/heads/master Commit: 27abe83522ad974c17eb5476b2cedbe299f1b7d9 Parents: ae46209 fc4de90 Author: Eric Newton <eric.new...@gmail.com> Authored: Tue Mar 11 14:56:53 2014 -0400 Committer: Eric Newton <eric.new...@gmail.com> Committed: Tue Mar 11 14:56:53 2014 -0400 ---------------------------------------------------------------------- assemble/pom.xml | 7 ++ bin/accumulo | 5 + core/pom.xml | 2 +- init/pom.xml | 98 ++++++++++++++++++++ .../main/packaging/etc/accumulo/accumulo-env.sh | 65 +++++++++++++ .../packaging/etc/accumulo/accumulo-site.xml | 87 +++++++++++++++++ .../main/packaging/etc/accumulo/auditLog.xml | 41 ++++++++ init/src/main/packaging/etc/accumulo/gc | 1 + .../packaging/etc/accumulo/generic_logger.xml | 83 +++++++++++++++++ .../packaging/etc/accumulo/log4j.properties | 41 ++++++++ init/src/main/packaging/etc/accumulo/masters | 1 + .../packaging/etc/accumulo/monitor_logger.xml | 64 +++++++++++++ init/src/main/packaging/etc/accumulo/monitors | 1 + init/src/main/packaging/etc/accumulo/slaves | 1 + init/src/main/packaging/etc/accumulo/tracers | 1 + pom.xml | 13 +++ server/base/pom.xml | 7 +- .../src/main/packaging/etc/init.d/accumulo-gc | 6 +- .../main/packaging/etc/init.d/accumulo-master | 6 +- .../main/packaging/etc/init.d/accumulo-monitor | 6 +- .../main/packaging/etc/init.d/accumulo-tracer | 6 +- .../main/packaging/etc/init.d/accumulo-tserver | 9 +- 22 files changed, 532 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/27abe835/assemble/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/27abe835/core/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/27abe835/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/27abe835/server/base/pom.xml ----------------------------------------------------------------------
