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/fc79e8b6 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/fc79e8b6 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/fc79e8b6 Branch: refs/heads/LOG4J2-1356 Commit: fc79e8b67acb523dafb2326f98e6a1103e17c31c Parents: 35138e9 67ca08b Author: rpopma <[email protected]> Authored: Fri Apr 8 00:42:25 2016 +0900 Committer: rpopma <[email protected]> Committed: Fri Apr 8 00:42:25 2016 +0900 ---------------------------------------------------------------------- log4j-core/pom.xml | 8 ++--- .../core/jackson/Log4jJsonObjectMapper.java | 2 +- .../core/jackson/Log4jXmlObjectMapper.java | 2 +- .../logging/log4j/MarkerMixInJsonTest.java | 31 +++++++++++++++++++ .../apache/logging/log4j/MarkerMixInTest.java | 8 +++-- .../logging/log4j/MarkerMixInXmlTest.java | 31 +++++++++++++++++++ .../log4j/core/impl/ThrowableProxyTest.java | 15 +++++++-- .../log4j/core/jackson/LevelMixInJsonTest.java | 28 +++++++++++++++++ .../log4j/core/jackson/LevelMixInTest.java | 9 ++++-- .../log4j/core/jackson/LevelMixInXmlTest.java | 32 ++++++++++++++++++++ 10 files changed, 151 insertions(+), 15 deletions(-) ----------------------------------------------------------------------
