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 2021/12/18 23:02:16 UTC

[logging-log4j2] 05/05: Merge branch 'felixbarny-backport-smtp-fix' into log4j-2.12

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

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

commit 52260db2d41f6f56945ab7a86601d1d9c9268f2b
Merge: 546a33b bb94ea9
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Sat Dec 18 16:01:50 2021 -0700

    Merge branch 'felixbarny-backport-smtp-fix' into log4j-2.12

 log4j-core/revapi.json                             |  29 ++-
 .../logging/log4j/core/appender/SmtpAppender.java  | 251 +++++++++++++++++----
 .../apache/logging/log4j/core/net/SmtpManager.java |  31 ++-
 .../log4j/core/appender/SmtpAppenderTest.java      |  20 +-
 src/changes/changes.xml                            |   5 +
 5 files changed, 280 insertions(+), 56 deletions(-)