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 2016/11/11 16:41:24 UTC
[3/3] logging-log4j2 git commit: Merge branch 'master' into
LOG4J2-1685
Merge branch 'master' into LOG4J2-1685
# 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/6123dc6f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6123dc6f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6123dc6f
Branch: refs/heads/LOG4J2-1685
Commit: 6123dc6fad95b1f6e5a3eb48fd16d86adfffe366
Parents: 028ae4b ca1510b
Author: Mikael St�ldal <mi...@magine.com>
Authored: Fri Nov 11 17:40:55 2016 +0100
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Fri Nov 11 17:40:55 2016 +0100
----------------------------------------------------------------------
.../org/apache/logging/log4j/ThreadContext.java | 20 ++++++++++
.../CopyOnWriteSortedArrayThreadContextMap.java | 13 +++++++
.../log4j/spi/DefaultThreadContextMap.java | 11 ++++++
.../GarbageFreeSortedArrayThreadContextMap.java | 10 +++++
.../log4j/spi/ObjectThreadContextMap.java | 4 +-
.../logging/log4j/spi/ThreadContextMap2.java | 2 +
.../logging/log4j/spi/ThreadContextMap3.java | 39 ++++++++++++++++++++
.../apache/logging/log4j/ThreadContextTest.java | 16 ++++++++
.../org/apache/logging/slf4j/MDCContextMap.java | 18 ++++++---
src/changes/changes.xml | 3 ++
10 files changed, 129 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6123dc6f/src/changes/changes.xml
----------------------------------------------------------------------
diff --cc src/changes/changes.xml
index bacf8f4,48c389d..ecc361f
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@@ -24,9 -24,9 +24,12 @@@
</properties>
<body>
<release version="2.8" date="2016-MM-DD" description="GA Release 2.8">
+ <action issue="LOG4J2-1685" dev="mikes" type="fix" due-to="Raman Gupta">
+ Option 'disableAnsi' in PatternLayout to unconditionally disable ANSI escape codes.
+ </action>
+ <action issue="LOG4J2-1689" dev="mikes" type="fix">
+ Add ThreadContextMap3 interface supporting method removeAll(Iterable<String>).
+ </action>
<action issue="LOG4J2-1679" dev="rpopma" type="fix">
(GC) Avoid allocating temporary objects in StructuredDataFilter.
</action>