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 2015/08/06 00:52:44 UTC
[2/2] logging-log4j2 git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
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/27cacebe
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/27cacebe
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/27cacebe
Branch: refs/heads/master
Commit: 27cacebe9f793dec167c51a72e724b50bec5c474
Parents: b5ee90a aa5151e
Author: rpopma <rp...@apache.org>
Authored: Thu Aug 6 07:52:16 2015 +0900
Committer: rpopma <rp...@apache.org>
Committed: Thu Aug 6 07:52:16 2015 +0900
----------------------------------------------------------------------
.../org/apache/logging/log4j/LogManager.java | 1100 +++++++++---------
.../rolling/DefaultRolloverStrategy.java | 4 +-
.../logging/log4j/core/config/LoggerConfig.java | 8 +-
log4j-samples/loggerProperties/pom.xml | 55 +
.../logging/log4j/lookup/CustomLookup.java | 84 ++
.../logging/log4j/lookup/CustomMapMessage.java | 51 +
.../logging/log4j/lookup/MapMessageLookup.java | 90 ++
.../logging/log4j/CustomPropertiesTest.java | 51 +
.../src/test/resources/log4j2.xml | 48 +
log4j-samples/pom.xml | 1 +
pom.xml | 2 +-
src/changes/changes.xml | 8 +-
12 files changed, 947 insertions(+), 555 deletions(-)
----------------------------------------------------------------------