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/23 01:30:33 UTC

[6/6] logging-log4j2 git commit: Merge remote-tracking branch 'origin/master' into StyledXException

Merge remote-tracking branch 'origin/master' into StyledXException

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/6b2573a1
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6b2573a1
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6b2573a1

Branch: refs/heads/StyledXException
Commit: 6b2573a13a4b3044617c46aaabd91dfff3419b52
Parents: 202592f 6b1048a
Author: Gary Gregory <gg...@apache.org>
Authored: Fri Jul 22 18:30:04 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Fri Jul 22 18:30:04 2016 -0700

----------------------------------------------------------------------
 .../org/apache/logging/log4j/LoggerTest.java    |   2 +-
 .../logging/log4j/core/LoggerContext.java       |  13 +-
 .../log4j/FormatterLoggerManualExample.java     |   7 +-
 .../apache/logging/log4j/LogRolloverTest.java   |  18 ++-
 .../ConsoleAppenderAnsiMessagesMain.java        | 110 +++++++------
 .../ConsoleAppenderAnsiStyleJira180Main.java    | 119 +++++++-------
 .../ConsoleAppenderAnsiStyleJira272Main.java    | 121 +++++++-------
 .../ConsoleAppenderAnsiStyleJira319Main.java    | 123 +++++++-------
 .../ConsoleAppenderAnsiStyleLayoutMain.java     | 149 +++++++++--------
 .../ConsoleAppenderAnsiStyleNameLayoutMain.java |  11 +-
 ...nsoleAppenderDefaultSuppressedThrowable.java | 131 ++++++++-------
 ...nsoleAppenderHighlightLayoutDefaultMain.java |  11 +-
 ...nsoleAppenderHighlightLayoutLogbackMain.java |  11 +-
 .../ConsoleAppenderHighlightLayoutMain.java     |  11 +-
 .../ConsoleAppenderJAnsiMessageMain.java        | 160 +++++++++----------
 .../ConsoleAppenderNoAnsiStyleLayoutMain.java   | 145 ++++++++---------
 .../log4j/core/appender/Jira739Test.java        | 103 ++++++------
 .../core/appender/ProgressConsoleTest.java      |   7 +-
 .../rolling/OnStartupTriggeringPolicyTest.java  |   2 -
 .../rolling/RollingAppenderCronTest.java        |   1 -
 .../log4j/core/config/ConfiguratorTest.java     |   5 +-
 .../core/config/TestConfiguratorError.java      |  13 +-
 .../builder/ConfigurationAssemblerTest.java     |   5 +-
 .../core/filter/DynamicThresholdFilterTest.java |  26 +--
 .../lookup/MainInputArgumentsLookupTest.java    |  11 +-
 src/changes/changes.xml                         |   3 +
 26 files changed, 643 insertions(+), 675 deletions(-)
----------------------------------------------------------------------