You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/03/08 22:23:08 UTC

[2/2] logging-log4j2 git commit: Merge remote-tracking branch 'origin/master'

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/a47a2248
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a47a2248
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a47a2248

Branch: refs/heads/master
Commit: a47a2248425e744cb9f4203029f9da89cc8ec900
Parents: 6207ea6 9529448
Author: rpopma <rp...@apache.org>
Authored: Wed Mar 9 08:22:58 2016 +1100
Committer: rpopma <rp...@apache.org>
Committed: Wed Mar 9 08:22:58 2016 +1100

----------------------------------------------------------------------
 .../apache/logging/log4j/EventLoggerTest.java   |  2 +-
 .../apache/logging/log4j/LambdaLoggerTest.java  |  3 +--
 .../logging/log4j/core/LoggerContext.java       |  2 ++
 .../logging/log4j/core/lookup/JndiLookup.java   |  2 +-
 .../logging/log4j/core/LoggerUpdateTest.java    | 15 +++++++++++++
 .../rolling/RollingAppenderSizeTest.java        | 15 +++++--------
 .../log4j/core/lookup/JndiLookupTest.java       | 18 ++++++++++++++++
 .../core/pattern/DatePatternConverterTest.java  |  2 +-
 .../apache/logging/log4j/junit/CleanFiles.java  |  2 +-
 .../log4j/test/appender/AlwaysFailAppender.java | 11 ++++------
 .../log4j/test/appender/DeadlockAppender.java   | 13 ++++--------
 .../log4j/test/appender/FailOnceAppender.java   | 13 ++++--------
 .../log4j/test/appender/InMemoryAppender.java   |  2 --
 .../log4j/test/appender/ListAppender.java       |  6 +-----
 .../test/appender/UsesLoggingAppender.java      | 22 +++++++-------------
 .../log4j/web/Log4jWebInitializerImpl.java      |  5 +++--
 src/changes/changes.xml                         | 14 ++++++++++++-
 src/site/xdoc/manual/configuration.xml.vm       |  4 ++++
 18 files changed, 85 insertions(+), 66 deletions(-)
----------------------------------------------------------------------