Merge remote-tracking branch 'origin/master' into LOG4J2-1553 Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8bc69221 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8bc69221 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8bc69221
Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext Commit: 8bc692211e3ea19b7cbb4918a6620be2c2a589a4 Parents: a0d08f3 114e687 Author: ggregory <ggreg...@apache.org> Authored: Wed Aug 31 09:02:15 2016 -0700 Committer: ggregory <ggreg...@apache.org> Committed: Wed Aug 31 09:02:15 2016 -0700 ---------------------------------------------------------------------- README.md | 8 ++ log4j-1.2-api/pom.xml | 4 - .../config/Log4j1ConfigurationConverter.java | 41 ++++++ .../config/Log4j1ConfigurationFactory.java | 1 - .../log4j/config/Log4j1ConfigurationParser.java | 20 +-- .../apache/log4j/layout/Log4j1XmlLayout.java | 4 +- .../pattern/Log4j1NdcPatternConverter.java | 4 +- .../org/apache/logging/log4j/util/Strings.java | 63 +++++++++ log4j-core/pom.xml | 10 ++ .../builder/api/ConfigurationBuilder.java | 16 +++ .../impl/DefaultConfigurationBuilder.java | 129 +++++++++++++++++++ .../RollingAppenderCronOnceADayTest.java | 2 +- .../builder/ConfigurationBuilderTest.java | 91 +++++++++++++ pom.xml | 12 ++ src/changes/changes.xml | 3 + 15 files changed, 389 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
