Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/9a01ec66 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/9a01ec66 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/9a01ec66 Branch: refs/heads/LOG4J2-1278-gc-free-logger Commit: 9a01ec66e78a5f3780a46be675616ecd462add44 Parents: 9371266 3542dae Author: ggregory <[email protected]> Authored: Wed Mar 9 00:20:31 2016 -0800 Committer: ggregory <[email protected]> Committed: Wed Mar 9 00:20:31 2016 -0800 ---------------------------------------------------------------------- .../log4j/core/async/AsyncLoggerConfigDisruptor.java | 4 ++-- .../log4j/core/async/AsyncLoggerDisruptor.java | 4 ++-- .../appender/rolling/RollingAppenderSizeTest.java | 15 +++++---------- .../logging/log4j/web/Log4jWebInitializerImpl.java | 5 +++-- src/changes/changes.xml | 3 +++ 5 files changed, 15 insertions(+), 16 deletions(-) ----------------------------------------------------------------------
