Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/93f55f37 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/93f55f37 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/93f55f37
Branch: refs/heads/LOG4J2-1528 Commit: 93f55f378d72e806ac0672f88d24a908097d654b Parents: a82794f 6a23301 Author: Gary Gregory <ggreg...@apache.org> Authored: Fri Aug 19 17:27:38 2016 -0700 Committer: Gary Gregory <ggreg...@apache.org> Committed: Fri Aug 19 17:27:38 2016 -0700 ---------------------------------------------------------------------- .../org/apache/logging/log4j/ThreadContext.java | 55 +++++++++++--------- .../log4j/spi/DefaultThreadContextMap.java | 6 +-- .../logging/log4j/spi/ThreadContextMap.java | 13 +---- .../logging/log4j/spi/ThreadContextMap2.java | 40 ++++++++++++++ .../org/apache/logging/slf4j/MDCContextMap.java | 7 +-- src/changes/changes.xml | 4 +- 6 files changed, 81 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/93f55f37/src/changes/changes.xml ----------------------------------------------------------------------
