You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@logging.apache.org by ma...@apache.org on 2019/10/06 18:29:38 UTC

[logging-log4j2] 03/04: Merge remote-tracking branch 'origin/master'

This is an automated email from the ASF dual-hosted git repository.

mattsicker pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git

commit 15c59b3a6c3a8fca0104d835277b8fe327c911c6
Merge: 116d8d4 ed3814f
Author: Matt Sicker <bo...@gmail.com>
AuthorDate: Sun Oct 6 13:14:39 2019 -0500

    Merge remote-tracking branch 'origin/master'

 .../log4j/core/appender/AbstractAppender.java      | 29 ++++++++++++++++++++++
 log4j-plugins-java9/src/assembly/java9.xml         |  1 +
 log4j-plugins-java9/src/main/java/module-info.java |  4 +++
 .../plugins/convert/plugins/Log4jPlugins.java}     | 15 +++++------
 .../plugins/validation/constraints/Dummy.java}     | 16 +++++-------
 .../plugins/validation/validators/Dummy.java}      | 16 +++++-------
 log4j-plugins/pom.xml                              | 14 +++++++++++
 src/changes/changes.xml                            |  3 +++
 src/site/asciidoc/manual/configuration.adoc        |  4 +--
 9 files changed, 71 insertions(+), 31 deletions(-)