This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/release-2.x by this push:
new cbbecfe LOG4J2-2815 - Allow Spring Boot applications to use composite
configuratons.
cbbecfe is described below
commit cbbecfec77edc2f1b2da56f0ffafb9de40fbf386
Author: Ralph Goers <[email protected]>
AuthorDate: Sat Apr 11 17:03:32 2020 -0700
LOG4J2-2815 - Allow Spring Boot applications to use composite configuratons.
---
src/site/xdoc/manual/configuration.xml.vm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/site/xdoc/manual/configuration.xml.vm
b/src/site/xdoc/manual/configuration.xml.vm
index e8ab9ce..70fbe5e 100644
--- a/src/site/xdoc/manual/configuration.xml.vm
+++ b/src/site/xdoc/manual/configuration.xml.vm
@@ -1308,7 +1308,8 @@ rootLogger.appenderRef.stdout.ref = STDOUT
<subsection name="Composite Configuration">
<p>
Log4j allows multiple configuration files to be used by
specifying them as a list of comma separated
- file paths on log4j.configurationFile. The merge logic can be
controlled by specifying a class
+ file paths on log4j.configurationFile or, when using urls, by
adding secondary configuration
+ locations as query parameters named "override". The merge logic
can be controlled by specifying a class
that implements the MergeStrategy interface on the
log4j.mergeStrategy property. The default
merge strategy will merge the files using the following rules:
<ol>
