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/09/11 06:26:05 UTC

[6/6] logging-log4j2 git commit: Merge branch 'master' into LOG4J2-1349-gcfree-threadcontext

Merge branch 'master' into LOG4J2-1349-gcfree-threadcontext


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/7ec63ce9
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/7ec63ce9
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/7ec63ce9

Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext
Commit: 7ec63ce9b1eb0aff62777a559732382a959100c1
Parents: 213ad7c a331f95
Author: rpopma <rp...@apache.org>
Authored: Sun Sep 11 15:25:39 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sun Sep 11 15:25:39 2016 +0900

----------------------------------------------------------------------
 .../core/appender/RollingFileAppender.java      | 749 ++++++++++---------
 .../rolling/RollingFileAppenderLayoutTest.java  |  39 +
 .../logging/log4j/core/config/PropertyTest.java |  63 ++
 .../src/test/resources/configPropertyTest.xml   |  36 +
 log4j-core/src/test/resources/log4j2-1573.xml   |  12 +
 src/changes/announcement.vm                     |   6 +-
 src/changes/changes.xml                         | 157 ++--
 7 files changed, 608 insertions(+), 454 deletions(-)
----------------------------------------------------------------------