You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@logging.apache.org by rg...@apache.org on 2019/12/07 04:58:43 UTC

[logging-log4j2] 03/03: Merge branch 'akorenko-LOG4J2-2674'

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

commit d304e034dfd3e3e5ca115b6b6e6f22d72d606850
Merge: b0e5bad d093ae1
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Fri Dec 6 21:58:16 2019 -0700

    Merge branch 'akorenko-LOG4J2-2674'

 .../java/org/apache/logging/log4j/core/config/Configuration.java | 4 +++-
 .../apache/logging/log4j/core/config/ConfigurationSource.java    | 9 ++++++++-
 .../log4j/core/config/composite/CompositeConfiguration.java      | 2 +-
 .../logging/log4j/core/config/CompositeConfigurationTest.java    | 3 +++
 src/changes/changes.xml                                          | 3 +++
 5 files changed, 18 insertions(+), 3 deletions(-)