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/428ed9a0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/428ed9a0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/428ed9a0 Branch: refs/heads/ACCUMULO-378 Commit: 428ed9a0f720cd3f7dd26f25fbcb760afd844f6d Parents: 49b1f08 5a72c37 Author: Bill Havanki <bhava...@cloudera.com> Authored: Mon May 5 09:26:38 2014 -0400 Committer: Bill Havanki <bhava...@cloudera.com> Committed: Mon May 5 09:26:38 2014 -0400 ---------------------------------------------------------------------- .../accumulo/core/util/AsyncSocketAppender.java | 112 +++++++++++++++++++ .../core/util/AsyncSocketAppenderTest.java | 79 +++++++++++++ .../test/functional/ConfigurableMacIT.java | 3 + .../test/functional/MonitorLoggingIT.java | 101 +++++++++++++++++ test/src/test/resources/conf/generic_logger.xml | 83 ++++++++++++++ test/src/test/resources/conf/monitor_logger.xml | 64 +++++++++++ 6 files changed, 442 insertions(+) ----------------------------------------------------------------------
