You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by vy...@apache.org on 2024/06/25 12:51:44 UTC
(logging-log4j2) 01/01: Merge remote-tracking branch 'origin/2.x' into doc/2.x/extending
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch doc/2.x/extending
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit defb250a729167d357456f6066d209f5f4569adb
Merge: df1813d2c1 bc3321875c
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Tue Jun 25 14:52:04 2024 +0200
Merge remote-tracking branch 'origin/2.x' into doc/2.x/extending
# Conflicts:
# src/site/antora/modules/ROOT/examples/manual/customloglevels/log4j2.json
# src/site/antora/modules/ROOT/pages/manual/customloglevels.adoc
.../custom-wait-strategy.json | 0
.../custom-wait-strategy.properties | 0
.../custom-wait-strategy.xml | 0
.../custom-wait-strategy.yaml | 0
.../{configuration => async}/mixed-async.json | 0
.../mixed-async.properties | 0
.../{configuration => async}/mixed-async.xml | 0
.../{configuration => async}/mixed-async.yaml | 0
.../examples/manual/configuration/scripts.json | 65 ------------------
.../examples/manual/customloglevels/log4j2.json | 54 +++++++--------
.../ROOT/examples/manual/scripts/log4j2.json | 65 ++++++++++++++++++
.../log4j2.properties} | 0
.../scripts.xml => scripts/log4j2.xml} | 0
.../scripts.yaml => scripts/log4j2.yaml} | 0
.../antora/modules/ROOT/pages/manual/async.adoc | 25 ++++---
.../modules/ROOT/pages/manual/configuration.adoc | 77 ++++++++++++++--------
.../modules/ROOT/pages/manual/customloglevels.adoc | 10 ++-
.../antora/modules/ROOT/pages/manual/filters.adoc | 10 ++-
.../antora/modules/ROOT/pages/manual/markers.adoc | 15 +++--
.../antora/modules/ROOT/pages/manual/scripts.adoc | 12 ++--
.../modules/ROOT/partials/manual/log-event.adoc | 2 +-
21 files changed, 191 insertions(+), 144 deletions(-)