[36/50] logging-log4j2 git commit: Merge branch 'master' into LOG4J2-1512

[rpopma]

Merge branch 'master' into LOG4J2-1512


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/04ac7e2a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/04ac7e2a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/04ac7e2a

Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext
Commit: 04ac7e2ae7376026bd13e0c6939954d040f3bb78
Parents: 0e86947 8e01bde
Author: Mikael Ståldal <mik...@staldal.nu>
Authored: Sun Aug 14 22:16:39 2016 +0200
Committer: Mikael Ståldal <mik...@staldal.nu>
Committed: Sun Aug 14 22:16:39 2016 +0200

----------------------------------------------------------------------
 log4j-1.2-api/pom.xml                           |   4 +
 .../config/Log4j1ConfigurationFactory.java      |  32 ++++--
 .../apache/log4j/layout/Log4j1XmlLayout.java    | 104 +++++++++++++++++++
 .../org/apache/log4j/layout/TTCCLayout.java     |  99 ++++++++++++++++++
 .../config/Log4j1ConfigurationFactoryTest.java  |  13 +--
 .../log4j/layout/Log4j1XmlLayoutTest.java       |  48 +++++++++
 .../org/apache/log4j/layout/TTCCLayoutTest.java |  82 +++++++++++++++
 .../log4j-console-XmlLayout.properties          |   2 +-
 .../core/pattern/MdcPatternConverterTest.java   |  26 ++---
 .../core/pattern/NdcPatternConverterTest.java   |  77 ++++++++++++++
 10 files changed, 459 insertions(+), 28 deletions(-)
----------------------------------------------------------------------