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/07/11 05:10:37 UTC
[12/25] logging-log4j2 git commit: Merge remote-tracking branch
'origin/master' into StyledMessage
Merge remote-tracking branch 'origin/master' into StyledMessage
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/cdff91c6
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/cdff91c6
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/cdff91c6
Branch: refs/heads/master
Commit: cdff91c648edd3c2b935afd230a4777f1ddbde14
Parents: 33e85dc a57ac9f
Author: Gary Gregory <gg...@apache.org>
Authored: Tue Jun 28 19:58:42 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Tue Jun 28 19:58:42 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/Logger.java | 11 +-
.../core/filter/DynamicThresholdFilter.java | 2 +-
.../log4j/core/appender/FileAppenderTest.java | 6 +-
.../rolling/OnStartupTriggeringPolicyTest.java | 28 ++--
.../RandomRollingAppenderOnStartupTest.java | 17 +-
.../rolling/RollingAppenderCronTest.java | 57 +++----
.../RollingAppenderCustomDeleteActionTest.java | 28 +---
...lingAppenderDeleteAccumulatedCount1Test.java | 29 +---
...lingAppenderDeleteAccumulatedCount2Test.java | 29 +---
...ollingAppenderDeleteAccumulatedSizeTest.java | 28 +---
.../RollingAppenderDeleteMaxDepthTest.java | 28 +---
.../RollingAppenderDeleteNestedTest.java | 29 +---
.../RollingAppenderDeleteScriptFri13thTest.java | 29 +---
.../RollingAppenderDeleteScriptTest.java | 27 +---
...ollingAppenderNoUnconditionalDeleteTest.java | 6 +-
.../rolling/RollingAppenderOnStartupTest.java | 15 +-
.../rolling/RollingAppenderSizeTest.java | 36 +----
.../rolling/RollingAppenderTimeAndSizeTest.java | 29 +---
.../rolling/RollingAppenderTimeTest.java | 36 ++---
.../RollingAppenderUncompressedTest.java | 28 ++--
...RandomAccessFileManagerHeaderFooterTest.java | 29 +---
.../RollingRandomAccessFileManagerTest.java | 155 +++++++++----------
.../routing/JsonRoutingAppender2Test.java | 16 +-
.../routing/JsonRoutingAppenderTest.java | 16 +-
.../routing/PropertiesRoutingAppenderTest.java | 23 ++-
.../appender/routing/RoutingAppenderTest.java | 11 +-
.../routing/RoutingAppenderWithJndiTest.java | 6 +-
.../routing/RoutingAppenderWithPurgingTest.java | 21 +--
.../routing/RoutingDefaultAppenderTest.java | 16 +-
.../junit/AbstractExternalFileCleaner.java | 81 ++++++++++
.../apache/logging/log4j/junit/CleanFiles.java | 56 +++----
.../logging/log4j/junit/CleanFolders.java | 90 ++++++-----
.../logging/log4j/junit/LoggerContextRule.java | 93 +++++++----
33 files changed, 487 insertions(+), 624 deletions(-)
----------------------------------------------------------------------