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/20 02:04:38 UTC

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

Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: b3d6a39b00b167ce1e56c2a03e2e4512ef991f08
Parents: 147f78c 93f55f3
Author: rpopma <rp...@apache.org>
Authored: Sat Aug 20 09:44:37 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sat Aug 20 09:44:37 2016 +0900

----------------------------------------------------------------------
 .../log4j/core/appender/FileManager.java        |  12 +-
 .../core/appender/OutputStreamManager.java      |  18 +-
 .../core/appender/RollingFileAppender.java      | 372 ++++++++++++-------
 .../appender/rolling/RollingFileManager.java    |  50 ++-
 .../rolling/OnStartupTriggeringPolicyTest.java  |  10 +-
 .../rolling/RollingAppenderSizeTest.java        |  43 ++-
 .../rolling/RollingFileAppenderAccessTest.java  |  61 +--
 .../test/resources/log4j-rolling-7z-lazy.xml    |  59 +++
 .../test/resources/log4j-rolling-bzip2-lazy.xml |  60 +++
 .../resources/log4j-rolling-deflate-lazy.xml    |  60 +++
 .../test/resources/log4j-rolling-gz-lazy.xml    |  59 +++
 .../resources/log4j-rolling-pack200-lazy.xml    |  60 +++
 .../test/resources/log4j-rolling-xz-lazy.xml    |  60 +++
 .../test/resources/log4j-rolling-zip-lazy.xml   |  60 +++
 src/changes/changes.xml                         |   5 +-
 15 files changed, 791 insertions(+), 198 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b3d6a39b/src/changes/changes.xml
----------------------------------------------------------------------