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-1528 Commit: c72522f426563139f952fccc2e87b6c10e380e79 Parents: 557a4c8 d8fb964 Author: rpopma <rpo...@apache.org> Authored: Sun Aug 28 19:28:53 2016 +0900 Committer: rpopma <rpo...@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 ----------------------------------------------------------------------