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

Branch: refs/heads/master
Commit: 1e77460e9260acfee68faa2c92886ca6dbfebbac
Parents: 895d869 817d898
Author: rpopma <rpo...@apache.org>
Authored: Fri Sep 23 02:04:59 2016 +0900
Committer: rpopma <rpo...@apache.org>
Committed: Fri Sep 23 02:04:59 2016 +0900

----------------------------------------------------------------------
 .../log4j/web/appender/ServletAppender.java     |  2 +-
 .../resources/WEB-INF/classes/log4j-servlet.xml | 64 ++++++++++----------
 src/changes/changes.xml                         |  3 +
 src/site/xdoc/manual/webapp.xml                 | 26 ++++++++
 4 files changed, 62 insertions(+), 33 deletions(-)
----------------------------------------------------------------------


Reply via email to