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:41 UTC

[logging-log4j2] 01/03: Merge branch 'LOG4J2-2674' of https://github.com/akorenko/logging-log4j2 into 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 334b767ea13c405b0463255890d31d34fd3ec001
Merge: b0e5bad 5f3b198
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Fri Dec 6 21:34:37 2019 -0700

    Merge branch 'LOG4J2-2674' of https://github.com/akorenko/logging-log4j2 into 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 +++
 4 files changed, 15 insertions(+), 3 deletions(-)