You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ck...@apache.org on 2018/04/24 13:09:30 UTC
logging-log4j2 git commit: fix changes.xml conflict
Repository: logging-log4j2
Updated Branches:
refs/heads/master b28496e32 -> cc5af3815
fix changes.xml conflict
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/cc5af381
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/cc5af381
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/cc5af381
Branch: refs/heads/master
Commit: cc5af3815b40e787c5a53de8dc554b20e9ca1de9
Parents: b28496e
Author: Carter Kozak <ck...@apache.org>
Authored: Tue Apr 24 09:09:03 2018 -0400
Committer: Carter Kozak <ck...@apache.org>
Committed: Tue Apr 24 09:09:03 2018 -0400
----------------------------------------------------------------------
src/changes/changes.xml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cc5af381/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index a327984..7408171 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -139,7 +139,6 @@
<action issue="LOG4J2-2317" dev="ckozak" type="fix">
MutableLogEvent.getNonNullImmutableMessage and Log4jLogEvent.makeMessageImmutable retain format and parameters.
</action>
-<<<<<<< HEAD
<action issue="LOG4J2-2318" dev="ckozak" type="fix">
Messages are no longer mutated when the asynchronous queue is full. A warning is logged to the status logger instead.
</action>