You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2015/07/09 06:57:37 UTC
[3/3] logging-log4j2 git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/logging-log4j2
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f6897710
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f6897710
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f6897710
Branch: refs/heads/master
Commit: f68977101c27b410b56295c639fa2fbc78c70453
Parents: 051f701 b1d61b0
Author: Ralph Goers <rg...@nextiva.com>
Authored: Wed Jul 8 21:51:26 2015 -0700
Committer: Ralph Goers <rg...@nextiva.com>
Committed: Wed Jul 8 21:51:26 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/Level.java | 5 +-
log4j-bom/pom.xml | 2 +-
.../rolling/DefaultRolloverStrategy.java | 135 +-
.../rolling/RolloverDescriptionImpl.java | 6 +-
.../rolling/action/Bzip2CompressAction.java | 131 -
.../rolling/action/CommonsCompressAction.java | 130 +
.../rolling/action/GzCompressAction.java | 10 +-
.../rolling/action/ZipCompressAction.java | 10 +-
.../core/config/AbstractConfiguration.java | 3 +-
.../plugins/processor/PluginProcessor.java | 5 +-
.../core/filter/DynamicThresholdFilter.java | 5 +-
.../logging/log4j/core/filter/MapFilter.java | 5 +-
.../logging/log4j/core/impl/Log4jLogEvent.java | 5 +-
.../logging/log4j/core/layout/GelfLayout.java | 23 +-
.../log4j/core/pattern/PatternParser.java | 5 +-
.../apache/logging/log4j/core/util/Loader.java | 1 -
log4j-core/src/site/xdoc/index.xml | 5 +-
.../rolling/RollingAppenderSizeTest.java | 4 +
.../rolling/action/Bzip2CompressActionTest.java | 240 +-
.../test/resources/log4j-rolling-deflate.xml | 59 +
.../test/resources/log4j-rolling-pack200.xml | 59 +
.../src/test/resources/log4j-rolling-xy.xml | 59 +
pom.xml | 2 +-
src/changes/changes.xml | 4129 +++++++++---------
src/site/xdoc/manual/appenders.xml | 11 +-
src/site/xdoc/runtime-dependencies.xml | 5 +-
26 files changed, 2651 insertions(+), 2403 deletions(-)
----------------------------------------------------------------------