You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/03/11 19:58:04 UTC
[8/8] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/accumulo
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f4b37443
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f4b37443
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f4b37443
Branch: refs/heads/master
Commit: f4b37443cde767e6946617073a75ab0228d48d39
Parents: ecf5ef7 27abe83
Author: Josh Elser <el...@apache.org>
Authored: Tue Mar 11 14:57:44 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Mar 11 14:57:44 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(-)
----------------------------------------------------------------------