You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/08/30 14:46:06 UTC
[22/50] logging-log4j2 git commit: Merge remote-tracking branch
'origin/LOG4J2-1528' into LOG4J2-1528
Merge remote-tracking branch 'origin/LOG4J2-1528' into LOG4J2-1528
Conflicts:
src/changes/changes.xml
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c72522f4
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c72522f4
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c72522f4
Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext
Commit: c72522f426563139f952fccc2e87b6c10e380e79
Parents: 557a4c8 d8fb964
Author: rpopma <rp...@apache.org>
Authored: Sun Aug 28 19:28:53 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sun Aug 28 19:28:53 2016 +0900
----------------------------------------------------------------------
log4j-1.2-api/pom.xml | 4 -
.../apache/log4j/layout/Log4j1XmlLayout.java | 4 +-
.../pattern/Log4j1NdcPatternConverter.java | 4 +-
.../org/apache/logging/log4j/util/Strings.java | 63 ++++++++++++++
.../impl/DefaultConfigurationBuilder.java | 50 +++++++----
.../builder/ConfigurationBuilderTest.java | 90 ++++++++++++++++++++
6 files changed, 190 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c72522f4/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
----------------------------------------------------------------------