Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/19e4271b Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/19e4271b Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/19e4271b Branch: refs/heads/master Commit: 19e4271bfd7497ab552530f618a0d39b4bbd0508 Parents: 3d2e324 8f6e87a Author: rpopma <[email protected]> Authored: Sun Jan 24 20:50:28 2016 +0900 Committer: rpopma <[email protected]> Committed: Sun Jan 24 20:50:28 2016 +0900 ---------------------------------------------------------------------- .../core/config/AbstractConfiguration.java | 20 +++++-- .../log4j/core/impl/Log4jContextFactory.java | 5 +- .../util/DefaultShutdownCallbackRegistry.java | 3 + .../logging/log4j/core/Log4j1222Test.java | 63 ++++++++++++++++++++ .../core/appender/rolling/FileSizeTest.java | 36 +++++++++++ .../log4j/core/config/TestConfigurator.java | 45 +++++++++++++- .../logging/log4j/perf/jmh/SimpleBenchmark.java | 16 +++++ .../org/apache/logging/slf4j/Log4j1222Test.java | 59 ++++++++++++++++++ src/changes/changes.xml | 4 ++ src/site/xdoc/manual/customconfig.xml | 46 ++++++++++++-- 10 files changed, 283 insertions(+), 14 deletions(-) ----------------------------------------------------------------------
