You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ts...@apache.org on 2020/02/09 20:19:52 UTC
[logging-log4cxx] 12/49: Merge branch 'master' of
https://github.com/apache/logging-log4cxx
This is an automated email from the ASF dual-hosted git repository.
tschoening pushed a commit to branch ghpr_14_replace-ant-build-with-cmake
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit 704a80fd800953e86a13ab6890ec556e1125847c
Merge: e5f8af1 ed1e4b4
Author: Stephen Webb <st...@sabreautonomous.com.au>
AuthorDate: Fri Jan 31 17:26:36 2020 +1100
Merge branch 'master' of https://github.com/apache/logging-log4cxx
.editorconfig | 19 ++
autogen.sh | 4 +-
configure-aprutil.bat | 15 +-
configure.bat | 8 +-
release_perform.sh | 15 +-
release_prepare.sh | 4 +-
release_purge.sh | 6 +-
src/changes/changes.xml | 1 +
src/main/cpp/Makefile.am | 1 +
src/main/cpp/jsonlayout.cpp | 389 +++++++++++++++++++++++++++
src/main/include/log4cxx/Makefile.am | 1 +
src/main/include/log4cxx/jsonlayout.h | 139 ++++++++++
src/test/cpp/Makefile.am | 1 +
src/test/cpp/jsonlayouttest.cpp | 481 ++++++++++++++++++++++++++++++++++
14 files changed, 1058 insertions(+), 26 deletions(-)