This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/master by this push:
new f82cc90 LOG4J2-2815 - Allow Spring Boot applications to use composite
configuratons.
f82cc90 is described below
commit f82cc90901e1e14d0ba3ca1a8cef4bfd5bb39710
Author: Ralph Goers <[email protected]>
AuthorDate: Sat Apr 11 17:03:15 2020 -0700
LOG4J2-2815 - Allow Spring Boot applications to use composite configuratons.
---
src/site/asciidoc/manual/configuration.adoc | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/site/asciidoc/manual/configuration.adoc
b/src/site/asciidoc/manual/configuration.adoc
index 125fac8..dd0fdff 100644
--- a/src/site/asciidoc/manual/configuration.adoc
+++ b/src/site/asciidoc/manual/configuration.adoc
@@ -1386,10 +1386,11 @@ file that includes two other files:
== Composite Configuration
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 that implements the
-MergeStrategy interface on the log4j.mergeStrategy property. The default
-merge strategy will merge the files using the following rules:
+as a list of comma separated 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:
1. The global configuration attributes are aggregated with those in
later configurations replacing those in previous configurations, with
