Merge remote-tracking branch 'remotes/origin/master' into LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d3d4d7dd Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d3d4d7dd Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d3d4d7dd Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure Commit: d3d4d7dd962df389465e4cc37c76a82c4b408c17 Parents: 4d4cc89 6a23301 Author: rpopma <[email protected]> Authored: Sat Aug 20 09:03:49 2016 +0900 Committer: rpopma <[email protected]> Committed: Sat Aug 20 09:03:49 2016 +0900 ---------------------------------------------------------------------- .../org/apache/logging/log4j/ThreadContext.java | 55 ++++---- .../log4j/spi/DefaultThreadContextMap.java | 6 +- .../logging/log4j/spi/ThreadContextMap.java | 13 +- .../logging/log4j/spi/ThreadContextMap2.java | 40 ++++++ .../core/pattern/MessagePatternConverter.java | 45 +++++-- .../logging/log4j/core/util/ArrayUtils.java | 124 +++++++++++++++++++ .../layout/PatternLayoutNoLookupDateTest.java | 26 ++++ .../log4j/core/layout/PatternLayoutTest.java | 2 +- .../src/test/resources/log4j-list-nolookups.xml | 29 +++++ .../org/apache/logging/slf4j/MDCContextMap.java | 7 +- src/changes/changes.xml | 7 +- src/site/xdoc/manual/appenders.xml | 6 + src/site/xdoc/manual/layouts.xml.vm | 12 +- 13 files changed, 311 insertions(+), 61 deletions(-) ----------------------------------------------------------------------
