This is an automated email from the ASF dual-hosted git repository.
ramanathan1504 pushed a change to branch fix-trace-metadata-1976
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from a02ac81e65 Add native W3C tracing fields to LogEvent and introduce
TraceContextProvider SPI
add 7f5459bb11 Merge `2.26.1` to `2.x` (#4169)
add 8d7f4e8ca7 Merge remote-tracking branch 'origin' into
fix-trace-metadata-1976
No new revisions were added by this update.
Summary of changes:
pom.xml | 6 +++---
src/changelog/{2.25.2 => 2.26.1}/.release-notes.adoc.ftl | 2 +-
src/changelog/{2.23.0 => 2.26.1}/.release.xml | 2 +-
.../LOG4J2-2006_Fix_RollingFileAppender_createOnDemand.xml | 0
...LOG4J2-4129_Fix_DatePatternConverter_locale_without_timezone.xml | 3 ++-
.../{.2.x.x => 2.26.1}/fix-MapMessage-JSON-non-finite-number.xml | 2 +-
.../{.2.x.x => 2.26.1}/fix-StructuredDataMessage-XML-encoding.xml | 0
...x-circular-reference-detection-for-exceptions-with-colliding.xml | 2 +-
.../{.2.x.x => 2.26.1}/fix-log-disruptor-initialization-errors.xml | 0
.../{.2.x.x => 2.26.1}/fix_configuration_source_url_leak.xml | 0
.../{.2.x.x => 2.26.1}/fix_kafka_appender_retry_error_reporting.xml | 0
src/site/antora/modules/ROOT/pages/manual/pattern-layout.adoc | 3 +--
12 files changed, 10 insertions(+), 10 deletions(-)
copy src/changelog/{2.25.2 => 2.26.1}/.release-notes.adoc.ftl (92%)
copy src/changelog/{2.23.0 => 2.26.1}/.release.xml (95%)
copy src/changelog/{.2.x.x =>
2.26.1}/LOG4J2-2006_Fix_RollingFileAppender_createOnDemand.xml (100%)
copy src/changelog/{.2.x.x =>
2.26.1}/LOG4J2-4129_Fix_DatePatternConverter_locale_without_timezone.xml (82%)
copy src/changelog/{.2.x.x =>
2.26.1}/fix-MapMessage-JSON-non-finite-number.xml (84%)
copy src/changelog/{.2.x.x =>
2.26.1}/fix-StructuredDataMessage-XML-encoding.xml (100%)
copy src/changelog/{.2.x.x =>
2.26.1}/fix-circular-reference-detection-for-exceptions-with-colliding.xml (96%)
copy src/changelog/{.2.x.x =>
2.26.1}/fix-log-disruptor-initialization-errors.xml (100%)
copy src/changelog/{.2.x.x => 2.26.1}/fix_configuration_source_url_leak.xml
(100%)
copy src/changelog/{.2.x.x =>
2.26.1}/fix_kafka_appender_retry_error_reporting.xml (100%)
