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/08/24 13:44:23 UTC
[9/9] logging-log4j2 git commit: Merge remote-tracking branch
'remotes/origin/master' into
LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Merge remote-tracking branch 'remotes/origin/master' into LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/3ebff538
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/3ebff538
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/3ebff538
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: 3ebff538cf2c1cb6f4fef2855c7fa57386d4e80e
Parents: 8b9e0e3 30ea283
Author: rpopma <rp...@apache.org>
Authored: Wed Aug 24 22:43:59 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Wed Aug 24 22:43:59 2016 +0900
----------------------------------------------------------------------
.../log4j/core/appender/FileAppender.java | 4 +--
.../core/appender/RollingFileAppender.java | 4 +--
.../core/config/AbstractConfiguration.java | 26 ++++++++++----------
.../core/config/plugins/util/ResolverUtil.java | 8 +++++-
.../apache/logging/log4j/core/jmx/Server.java | 8 ++++--
.../core/appender/OutputStreamAppenderTest.java | 2 +-
.../rolling/RollingFileAppenderAccessTest.java | 2 +-
.../config/plugins/util/ResolverUtilTest.java | 20 +++++++++++++++
src/changes/changes.xml | 9 +++++++
9 files changed, 61 insertions(+), 22 deletions(-)
----------------------------------------------------------------------