You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2016/09/07 16:15:53 UTC

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

Merge remote-tracking branch 'origin/master'


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

Branch: refs/heads/master
Commit: a559d5caf300daab8d4d9d0ffb7527628e2a9c0b
Parents: f016c44 15eb84c
Author: Mikael St�ldal <mi...@magine.com>
Authored: Wed Sep 7 18:15:48 2016 +0200
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Wed Sep 7 18:15:48 2016 +0200

----------------------------------------------------------------------
 .../rolling/AbstractTriggeringPolicy.java       | 28 ++++++++++++++++++++
 .../rolling/CompositeTriggeringPolicy.java      |  2 +-
 .../appender/rolling/CronTriggeringPolicy.java  |  2 +-
 .../rolling/OnStartupTriggeringPolicy.java      |  2 +-
 .../rolling/SizeBasedTriggeringPolicy.java      |  2 +-
 .../rolling/TimeBasedTriggeringPolicy.java      |  2 +-
 src/changes/changes.xml                         |  3 +++
 7 files changed, 36 insertions(+), 5 deletions(-)
----------------------------------------------------------------------