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/12 06:12:28 UTC
[14/14] git commit: Merge remote-tracking branch
'origin/1.6.0-SNAPSHOT' into ACCUMULO-2061
Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT' into ACCUMULO-2061
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/db76dd75
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/db76dd75
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/db76dd75
Branch: refs/heads/ACCUMULO-2061
Commit: db76dd75161c9a6ad94a6a4cc5e1f5656d80e21c
Parents: 85b5caf 0930732
Author: Josh Elser <el...@apache.org>
Authored: Wed Mar 12 01:06:44 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Wed Mar 12 01:06: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 | 16 ++++
.../packaging/etc/accumulo/generic_logger.xml | 83 +++++++++++++++++
.../packaging/etc/accumulo/log4j.properties | 41 ++++++++
init/src/main/packaging/etc/accumulo/masters | 16 ++++
.../packaging/etc/accumulo/monitor_logger.xml | 64 +++++++++++++
init/src/main/packaging/etc/accumulo/monitors | 16 ++++
init/src/main/packaging/etc/accumulo/slaves | 16 ++++
init/src/main/packaging/etc/accumulo/tracers | 15 +++
pom.xml | 13 +++
.../apache/accumulo/proxy/SimpleProxyIT.java | 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 +-
.../org/apache/accumulo/test/DeleteRowsIT.java | 2 +-
.../org/apache/accumulo/test/NamespacesIT.java | 8 +-
.../org/apache/accumulo/test/ShellServerIT.java | 6 +-
.../accumulo/test/functional/BloomFilterIT.java | 30 +++---
27 files changed, 640 insertions(+), 44 deletions(-)
----------------------------------------------------------------------