You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2016/09/01 16:33:11 UTC
[26/50] logging-log4j2 git commit: Merge remote-tracking branch
'origin/master' into LOG4J2-1553
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/e9b9ad9f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e9b9ad9f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e9b9ad9f
Branch: refs/heads/feature/LOG4J2-1430
Commit: e9b9ad9f1c1af8513b824100c046a78545527cd6
Parents: 7ad1489 b46c23c
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Aug 29 12:56:44 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Aug 29 12:56:44 2016 -0700
----------------------------------------------------------------------
.../core/appender/routing/IdlePurgePolicy.java | 57 ++++++---
.../core/appender/routing/RoutingAppender.java | 35 +++---
.../log4j/core/layout/AbstractCsvLayout.java | 10 +-
.../apache/logging/log4j/core/DeadlockTest.java | 2 +-
.../logging/log4j/core/LoggerUpdateTest.java | 2 +-
.../CsvJsonParameterLayoutFileAppenderTest.java | 117 +++++++++++++++++++
.../appender/JsonCompleteFileAppenderTest.java | 2 +-
.../appender/RandomAccessFileAppenderTests.java | 2 +-
.../RollingAppenderCronOnceADayTest.java | 2 +-
.../rolling/RollingAppenderCronTest.java | 2 +-
.../routing/PropertiesRoutingAppenderTest.java | 2 +-
.../appender/routing/RoutingAppenderTest.java | 2 +-
.../routing/RoutingAppenderWithPurgingTest.java | 21 +++-
.../routing/RoutingDefaultAppenderTest.java | 2 +-
.../log4j/core/config/ConfigurationTest.java | 2 +-
.../core/config/CustomConfigurationTest.java | 2 +-
.../core/config/MissingRootLoggerTest.java | 2 +-
.../logging/log4j/core/config/XIncludeTest.java | 2 +-
.../core/util/ShutdownCallbackRegistryTest.java | 2 +-
.../logging/log4j/junit/LoggerContextRule.java | 22 ++--
.../test/resources/log4j-cvs-json-parameter.xml | 32 +++++
log4j-samples/scala-api/.gitignore | 3 +
src/changes/changes.xml | 18 ++-
23 files changed, 273 insertions(+), 70 deletions(-)
----------------------------------------------------------------------