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/27 06:51:41 UTC
[13/40] logging-log4j2 git commit: Merge remote-tracking branch
'origin/master' into LOG4J2-1547-AbstractConfiguration-with-LoggerContext
Merge remote-tracking branch 'origin/master' into LOG4J2-1547-AbstractConfiguration-with-LoggerContext
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/e15d0c71
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e15d0c71
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e15d0c71
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: e15d0c7126884f67dd81067e4bc939631a38ba26
Parents: 56eba73 e033027
Author: Gary Gregory <gg...@apache.org>
Authored: Thu Aug 25 13:20:29 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Thu Aug 25 13:20:29 2016 -0700
----------------------------------------------------------------------
.../core/config/ConfigurationScheduler.java | 2 +-
.../core/config/plugins/util/ResolverUtil.java | 11 +-
.../apache/logging/log4j/core/jmx/Server.java | 4 +
.../RollingAppenderCronOnceADayTest.java | 128 ++++++++++++
.../plugins/util/PluginManagerPackagesTest.java | 2 +-
.../util/ResolverUtilCustomProtocolTest.java | 208 +++++++++++++++++++
.../config/plugins/util/ResolverUtilTest.java | 146 +++++++------
.../junit/URLStreamHandlerFactoryRule.java | 96 +++++++++
.../resources/log4j-rolling-cron-once-a-day.xml | 47 +++++
.../src/test/resources/log4j-rolling-cron.xml | 2 +-
.../src/test/resources/log4j-rolling-cron2.xml | 2 +-
src/changes/changes.xml | 5 +-
12 files changed, 585 insertions(+), 68 deletions(-)
----------------------------------------------------------------------