Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ab453545 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ab453545 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ab453545 Branch: refs/heads/master Commit: ab453545961c526f06dfd48b0056990c4fcdd5a8 Parents: 428ed9a cdcc1d4 Author: Bill Havanki <bhava...@cloudera.com> Authored: Mon May 5 09:39:33 2014 -0400 Committer: Bill Havanki <bhava...@cloudera.com> Committed: Mon May 5 09:39:33 2014 -0400 ---------------------------------------------------------------------- conf/templates/generic_logger.properties | 58 ++++++++++++++++++++ conf/templates/monitor_logger.properties | 44 +++++++++++++++ .../org/apache/accumulo/server/Accumulo.java | 39 +++++++++++-- .../server/watcher/MonitorLog4jWatcher.java | 19 ++++++- .../apache/accumulo/server/AccumuloTest.java | 51 +++++++++++++++++ .../server/watcher/MonitorLog4jWatcherTest.java | 50 +++++++++++++++++ 6 files changed, 252 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab453545/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab453545/server/base/src/main/java/org/apache/accumulo/server/watcher/MonitorLog4jWatcher.java ----------------------------------------------------------------------
