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

Branch: refs/heads/master
Commit: 23731ded060be8adde27f83f604f98ad7712abe3
Parents: d4bdb74 0a79e26
Author: rpopma <rpo...@apache.org>
Authored: Fri Sep 23 12:05:21 2016 +0900
Committer: rpopma <rpo...@apache.org>
Committed: Fri Sep 23 12:05:21 2016 +0900

----------------------------------------------------------------------
 .../log4j/web/appender/ServletAppender.java     | 104 ++++++++++++++-----
 .../resources/WEB-INF/classes/log4j-servlet.xml |   2 +-
 src/changes/changes.xml                         |   5 +-
 3 files changed, 82 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


Reply via email to