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 4ffba69e93d73c7bd28b13e7b3a40eaa61e157a1 Merge: 5b81898 ed1e4b4 Author: Stephen Webb <[email protected]> AuthorDate: Fri Jan 31 17:56:32 2020 +1100 Merge 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(-)
