You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2016/04/29 16:32:28 UTC

[4/6] logging-log4j2 git commit: Merge remote-tracking branch 'origin/master'

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

Branch: refs/heads/LOG4J2-1347
Commit: 0e815dd956b78a719677637e4ea6b2d10ca068f8
Parents: f2f0faa 4d5c162
Author: rpopma <rp...@apache.org>
Authored: Fri Apr 29 01:37:50 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Fri Apr 29 01:37:50 2016 +0900

----------------------------------------------------------------------
 README.md                          | 5 ++++-
 src/site/xdoc/articles.xml         | 8 ++++++++
 src/site/xdoc/manual/appenders.xml | 4 ++--
 src/site/xdoc/manual/markers.xml   | 5 +++--
 4 files changed, 17 insertions(+), 5 deletions(-)
----------------------------------------------------------------------