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 2017/08/17 18:39:44 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/d2aa15bd
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d2aa15bd
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d2aa15bd
Branch: refs/heads/master
Commit: d2aa15bd10e502e688bb69de60a87d99455da168
Parents: fb8f54e b96c60f
Author: Mikael Ståldal <mi...@staldal.nu>
Authored: Thu Aug 17 20:39:04 2017 +0200
Committer: Mikael Ståldal <mi...@staldal.nu>
Committed: Thu Aug 17 20:39:04 2017 +0200
----------------------------------------------------------------------
.../log4j/core/net/SslSocketManager.java | 31 ++++++--------------
.../log4j/core/net/TcpSocketManager.java | 22 +++++++-------
pom.xml | 2 +-
3 files changed, 21 insertions(+), 34 deletions(-)
----------------------------------------------------------------------