You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2016/08/31 16:24:08 UTC
[26/33] logging-log4j2 git commit: Merge branch 'master' into
LOG4J2-1528
Merge branch 'master' into LOG4J2-1528
# 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/45a7da2d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/45a7da2d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/45a7da2d
Branch: refs/heads/LOG4J2-1553
Commit: 45a7da2d27df625855f3b0529a716ee931cd987f
Parents: ea90a31 ef321c1
Author: Mikael St�ldal <mi...@magine.com>
Authored: Tue Aug 30 11:26:58 2016 +0200
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Tue Aug 30 11:26:58 2016 +0200
----------------------------------------------------------------------
.../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 +-
.../db/jdbc/AbstractJdbcAppenderTest.java | 12 +-
.../db/jpa/AbstractJpaAppenderTest.java | 12 +-
.../core/appender/db/jpa/JpaH2AppenderTest.java | 28 +++--
.../db/jpa/JpaHyperSqlAppenderTest.java | 28 +++--
.../RollingAppenderCronOnceADayTest.java | 4 +-
.../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/site/xdoc/maven-artifacts.xml.vm | 28 +++++
27 files changed, 318 insertions(+), 117 deletions(-)
----------------------------------------------------------------------