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/cc267059 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/cc267059 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/cc267059 Branch: refs/heads/master Commit: cc2670593c4b68d34b61d9167f8ac73837a6f05f Parents: 13bb3d9 b6c67b4 Author: Mikael Ståldal <mikael.stal...@magine.com> Authored: Thu Dec 3 10:54:25 2015 +0100 Committer: Mikael Ståldal <mikael.stal...@magine.com> Committed: Thu Dec 3 10:54:25 2015 +0100 ---------------------------------------------------------------------- .../appender/AbstractOutputStreamAppender.java | 14 +++- .../log4j/core/appender/ConsoleAppender.java | 58 ++++++++++--- .../log4j/core/appender/SocketAppender.java | 85 ++++++++++---------- .../core/appender/ConsoleAppenderTest.java | 14 ++-- .../log4j/core/appender/SocketAppenderTest.java | 31 ++++--- .../net/server/AbstractSocketServerTest.java | 10 +-- .../core/net/server/SslXmlSocketServerTest.java | 4 +- 7 files changed, 133 insertions(+), 83 deletions(-) ----------------------------------------------------------------------