Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/954dc7d7 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/954dc7d7 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/954dc7d7 Branch: refs/heads/LOG4J2-1278-gc-free-logger Commit: 954dc7d7d25cf3afe6bd277c1ffc42cce7e2ac11 Parents: 83520a3 666fd7b Author: rpopma <[email protected]> Authored: Wed Feb 24 23:04:31 2016 +0900 Committer: rpopma <[email protected]> Committed: Wed Feb 24 23:04:31 2016 +0900 ---------------------------------------------------------------------- .../org/apache/logging/log4j/spi/AbstractLogger.java | 2 +- .../logging/log4j/core/appender/db/jpa/JpaAppender.java | 11 ++++------- .../log4j/core/async/AsyncEventRouterFactory.java | 10 +++++----- .../apache/logging/log4j/core/async/DisruptorUtil.java | 5 +++-- .../apache/logging/log4j/core/layout/PatternLayout.java | 6 ++---- .../apache/logging/log4j/core/util/ReflectionUtil.java | 4 +--- .../org/apache/logging/log4j/perf/nogc/NoGcLayout.java | 1 + .../main/java/org/apache/logging/slf4j/Log4jLogger.java | 3 ++- .../apache/logging/slf4j/SLF4JLoggerContextFactory.java | 3 ++- 9 files changed, 21 insertions(+), 24 deletions(-) ----------------------------------------------------------------------
