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/16e7ef70
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/16e7ef70
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/16e7ef70

Branch: refs/heads/master
Commit: 16e7ef70ca44e0f403951fa9491ff3506139ee62
Parents: 3ed968e 215d934
Author: rpopma <rpo...@apache.org>
Authored: Thu Sep 22 11:04:18 2016 +0900
Committer: rpopma <rpo...@apache.org>
Committed: Thu Sep 22 11:04:18 2016 +0900

----------------------------------------------------------------------
 log4j-core/pom.xml                              |   6 +
 .../core/net/server/AbstractSocketServer.java   |  93 +++++++++-
 .../log4j/core/net/server/TcpSocketServer.java  | 180 ++++++++++++-------
 .../log4j/core/net/server/UdpSocketServer.java  |  83 ++++-----
 .../log4j/core/util/InetAddressConverter.java   |  19 ++
 log4j-core/src/test/resources/log4j-console.xml |  29 +++
 pom.xml                                         |   5 +
 src/changes/changes.xml                         |   3 +
 src/site/xdoc/runtime-dependencies.xml          |  12 +-
 9 files changed, 317 insertions(+), 113 deletions(-)
----------------------------------------------------------------------


Reply via email to