You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/04/07 17:42:42 UTC
[13/13] logging-log4j2 git commit: Merge remote-tracking branch
'origin/master'
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/master
Commit: fc79e8b67acb523dafb2326f98e6a1103e17c31c
Parents: 35138e9 67ca08b
Author: rpopma <rp...@apache.org>
Authored: Fri Apr 8 00:42:25 2016 +0900
Committer: rpopma <rp...@apache.org>
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(-)
----------------------------------------------------------------------