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:40 UTC
[logging-log4j2] branch master updated (b0e5bad -> d304e03)
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.
from b0e5bad Merge branch 'mattrpav-LOG4J2-2732'
add 5f3b198 [LOG4J2-2674] CompositeConfiguration misleading configuration source
new 334b767 Merge branch 'LOG4J2-2674' of https://github.com/akorenko/logging-log4j2 into akorenko-LOG4J2-2674
new d093ae1 LOG4J2-2674 - Change the name of the ConfigurationSource
new d304e03 Merge branch 'akorenko-LOG4J2-2674'
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../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(-)
[logging-log4j2] 03/03: Merge branch 'akorenko-LOG4J2-2674'
Posted by rg...@apache.org.
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(-)
[logging-log4j2] 02/03: LOG4J2-2674 - Change the name of the
ConfigurationSource
Posted by rg...@apache.org.
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 d093ae164b8e5a453b6e5d5f57cd18dbb22c7f53
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Fri Dec 6 21:57:31 2019 -0700
LOG4J2-2674 - Change the name of the ConfigurationSource
---
src/changes/changes.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 29b5b75..c577e4e 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -160,6 +160,9 @@
</action>
</release>
<release version="2.13.0" date="2019-MM-DD" description="GA Release 2.13.0">
+ <action issue="LOG4J2-2674" dev="rgoers" type="fix" due-to="Anton Korenkov">
+ Use a less confusing name for the CompositeConfiguration source.
+ </action>
<action issue="LOG4J2-2732" dev="rgoers" type="add" due-to="Matt Pavlovich">
Add ThreadContext.putIfNotNull method.
</action>
[logging-log4j2] 01/03: Merge branch 'LOG4J2-2674' of
https://github.com/akorenko/logging-log4j2 into akorenko-LOG4J2-2674
Posted by rg...@apache.org.
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(-)