You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@logging.apache.org by rg...@apache.org on 2020/04/12 17:41:04 UTC

[logging-log4j2] 03/03: Merge branch 'wlfshmn-LOG4J2-2791' into release-2.x

This is an automated email from the ASF dual-hosted git repository.

rgoers pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git

commit 2325482352b5f4536aca4f0db2d28c68299bec55
Merge: 62863cb 5933494
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Sun Apr 12 10:40:40 2020 -0700

    Merge branch 'wlfshmn-LOG4J2-2791' into release-2.x

 .../log4j/core/jackson/LogEventJsonMixIn.java      |  2 +-
 .../appender/JsonCompleteFileAppenderTest.java     |  8 +++----
 .../ConcurrentLoggingWithJsonLayoutTest.java       |  2 +-
 .../logging/log4j/core/layout/JsonLayoutTest.java  | 26 ++++++++++++++++++++++
 src/changes/changes.xml                            |  3 +++
 5 files changed, 35 insertions(+), 6 deletions(-)