Merge branch 'master' into LOG4J2-1623 # 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/19418b37 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/19418b37 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/19418b37 Branch: refs/heads/LOG4J2-1623 Commit: 19418b37df948609a8852a17f206076048043f6f Parents: 6482da5 197997a Author: Mikael Ståldal <mikael.stal...@magine.com> Authored: Mon Oct 17 13:14:16 2016 +0200 Committer: Mikael Ståldal <mikael.stal...@magine.com> Committed: Mon Oct 17 13:14:16 2016 +0200 ---------------------------------------------------------------------- .../logging/log4j/util/PropertiesUtil.java | 597 ++++++++++--------- .../log4j/core/appender/AbstractAppender.java | 8 + .../log4j/core/appender/ConsoleAppender.java | 23 +- .../core/appender/MemoryMappedFileAppender.java | 2 +- .../logging/log4j/core/layout/HtmlLayout.java | 81 +-- .../logging/log4j/core/lookup/JndiLookup.java | 5 +- .../appender/ConsoleAppenderBuilderTest.java | 80 ++- pom.xml | 2 +- src/changes/changes.xml | 11 +- 9 files changed, 446 insertions(+), 363 deletions(-) ----------------------------------------------------------------------
