Merge branch 'master' into LOG4J2-1395
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/76400477 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/76400477 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/76400477 Branch: refs/heads/master Commit: 76400477aae680862e3001107d06faf1fe3e244f Parents: a9bff15 2c4bdbb Author: Mikael Ståldal <mikael.stal...@magine.com> Authored: Tue May 31 10:18:03 2016 +0200 Committer: Mikael Ståldal <mikael.stal...@magine.com> Committed: Tue May 31 10:18:03 2016 +0200 ---------------------------------------------------------------------- src/site/xdoc/manual/appenders.xml | 3 ++- src/site/xdoc/runtime-dependencies.xml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/76400477/src/site/xdoc/manual/appenders.xml ----------------------------------------------------------------------
