Merge branch 'master' into LOG4J2-649
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/673b1f9b Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/673b1f9b Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/673b1f9b Branch: refs/heads/LOG4J2-649 Commit: 673b1f9b00b32b6f2f03129d7820dfade53dbd45 Parents: c672c93 1c786f6 Author: Mikael Ståldal <mikael.stal...@magine.com> Authored: Wed Dec 2 10:07:21 2015 +0100 Committer: Mikael Ståldal <mikael.stal...@magine.com> Committed: Wed Dec 2 10:07:21 2015 +0100 ---------------------------------------------------------------------- .../log4j/core/appender/SocketAppender.java | 97 ++++++++++++++++---- .../apache/logging/log4j/core/net/Protocol.java | 4 +- .../log4j/core/appender/SocketAppenderTest.java | 9 +- .../net/server/AbstractSocketServerTest.java | 5 +- .../core/net/server/SslXmlSocketServerTest.java | 3 +- .../net/server/TcpJsonSocketServerTest.java | 3 +- .../server/TcpSerializedSocketServerTest.java | 3 +- .../core/net/server/TcpXmlSocketServerTest.java | 3 +- .../net/server/UdpJsonSocketServerTest.java | 3 +- .../server/UdpSerializedSocketServerTest.java | 3 +- .../core/net/server/UdpXmlSocketServerTest.java | 3 +- 11 files changed, 101 insertions(+), 35 deletions(-) ----------------------------------------------------------------------
