You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2017/06/28 12:52:50 UTC
[2/2] logging-log4j2 git commit: Merge branch 'master' into
LOG4J2-1958
Merge branch 'master' into LOG4J2-1958
# Conflicts:
# src/changes/changes.xml
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c1b90f96
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c1b90f96
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c1b90f96
Branch: refs/heads/LOG4J2-1958
Commit: c1b90f96151c1a0e217ee2ed36c29eb325ff7d25
Parents: 330a16f a5a9588
Author: Mikael Ståldal <mi...@staldal.nu>
Authored: Wed Jun 28 14:52:26 2017 +0200
Committer: Mikael Ståldal <mi...@staldal.nu>
Committed: Wed Jun 28 14:52:26 2017 +0200
----------------------------------------------------------------------
.../mom/activemq/JmsAppenderConnectLaterIT.java | 108 +++++++
.../log4j/core/appender/FileManager.java | 65 +++--
.../core/appender/RollingFileAppender.java | 12 +-
.../RollingRandomAccessFileAppender.java | 6 +-
.../rolling/DefaultRolloverStrategy.java | 289 ++++++++++++++++---
.../rolling/DirectWriteRolloverStrategy.java | 220 ++++++++++++--
.../appender/rolling/RollingFileManager.java | 6 +-
.../rolling/RollingRandomAccessFileManager.java | 4 +-
.../action/PosixViewAttributeAction.java | 6 +-
...irectWriteTempCompressedFilePatternTest.java | 99 +++++++
...ngAppenderTempCompressedFilePatternTest.java | 150 ++++++++++
...log4j-rolling-direct-tmp-compress-folder.xml | 52 ++++
.../resources/log4j-rolling-gz-tmp-compress.xml | 62 ++++
src/changes/changes.xml | 3 +
src/site/xdoc/manual/appenders.xml | 14 +-
15 files changed, 994 insertions(+), 102 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c1b90f96/src/changes/changes.xml
----------------------------------------------------------------------
diff --cc src/changes/changes.xml
index a171173,d272730..305b4c3
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@@ -31,9 -31,9 +31,12 @@@
- "remove" - Removed
-->
<release version="2.9.0" date="2017-MM-DD" description="GA Release 2.9.0">
+ <action issue="LOG4J2-1958" dev="mikes" type="update">
+ Deprecate SerializedLayout and remove it as default.
+ </action>
+ <action issue="LOG4J2-1766" dev="ggregory" type="add" due-to="Pierrick HYMBERT">
+ Temporary compress directory during rollover (#88).
+ </action>
<action issue="LOG4J2-1950" dev="ggregory" type="update" due-to="Pierrick HYMBERT">
Fix docker build with jdk9 requirements (#84).
</action>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c1b90f96/src/site/xdoc/manual/appenders.xml
----------------------------------------------------------------------