You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2019/07/08 05:56:26 UTC
[logging-log4j2] 01/01: Merge pull request #288 from
apache/LOG4J2-2644-2.x
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 24adaff8ef0b440812e9df7e9cd25d5710511c6f
Merge: 649de55 2a7d1ce
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Sun Jul 7 22:56:21 2019 -0700
Merge pull request #288 from apache/LOG4J2-2644-2.x
Log4 j2 2644 for release-2.x
.../apache/logging/log4j/util/StackLocator.java | 37 +-
.../apache/logging/log4j/spi/AbstractLogger.java | 39 +-
.../logging/log4j/spi/ExtendedLoggerWrapper.java | 5 +
.../logging/log4j/spi/LocationAwareLogger.java | 29 +
.../apache/logging/log4j/util/StackLocator.java | 2 +-
.../java/org/apache/logging/log4j/core/Logger.java | 19 +
.../log4j/core/appender/AbstractAppender.java | 8 +-
.../logging/log4j/core/async/AsyncLogger.java | 100 +
.../config/AwaitCompletionReliabilityStrategy.java | 21 +-
.../AwaitUnconditionallyReliabilityStrategy.java | 16 +-
.../core/config/DefaultReliabilityStrategy.java | 16 +-
.../LocationAwareReliabilityStrategy.java} | 38 +-
.../core/config/LockingReliabilityStrategy.java | 22 +-
.../logging/log4j/core/config/LoggerConfig.java | 83 +-
.../log4j/core/impl/DefaultLogEventFactory.java | 22 +-
.../logging/log4j/core/impl/LocationAware.java | 25 +
...tory.java => LocationAwareLogEventFactory.java} | 31 +-
.../logging/log4j/core/impl/Log4jLogEvent.java | 24 +
.../logging/log4j/core/impl/MutableLogEvent.java | 4 +
.../log4j/core/impl/ReusableLogEventFactory.java | 25 +-
.../log4j/core/layout/AbstractStringLayout.java | 7 +-
.../logging/log4j/core/layout/HtmlLayout.java | 5 +
.../log4j/core/layout/MarkerPatternSelector.java | 23 +-
.../logging/log4j/core/layout/PatternLayout.java | 26 +-
.../log4j/core/layout/ScriptPatternSelector.java | 23 +-
.../core/pattern/ClassNamePatternConverter.java | 9 +-
.../core/pattern/FullLocationPatternConverter.java | 9 +-
.../core/pattern/LineLocationPatternConverter.java | 8 +-
.../pattern/MethodLocationPatternConverter.java | 9 +-
.../log4j/core/pattern/PatternFormatter.java | 11 +-
.../logging/log4j/core/LogEventFactoryTest.java | 10 +-
.../log4j/perf/jmh/FileAppenderBenchmark.java | 6 +-
src/changes/changes.xml | 9213 ++++++++++----------
33 files changed, 5226 insertions(+), 4699 deletions(-)