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

Posted to commits@logging.apache.org by gg...@apache.org on 2021/01/16 17:29:52 UTC

[logging-log4j2] 01/02: Merge branch 'release-2.x' of https://gitbox.apache.org/repos/asf/logging-log4j2 into release-2.x

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

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

commit d2adba0d6d554edebabd7367c3a7a7af6af09192
Merge: 750e914 06b31d2
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jan 16 11:17:55 2021 -0500

    Merge branch 'release-2.x' of https://gitbox.apache.org/repos/asf/logging-log4j2 into release-2.x

 .../layout/template/json/util/JsonWriter.java      |  12 +-
 .../layout/template/json/util/JsonWriterTest.java  | 142 +++++++++++++++++++--
 src/changes/changes.xml                            |   3 +
 3 files changed, 142 insertions(+), 15 deletions(-)