Merge branch 'master' into LOG4J-1181
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b9bc02c2 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b9bc02c2 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b9bc02c2 Branch: refs/heads/LOG4J-1181 Commit: b9bc02c2f1a1fe4bcb9f20511638b79d1a67e629 Parents: 9a7bdff 4500fdf Author: Mikael Ståldal <[email protected]> Authored: Mon Nov 9 17:17:27 2015 +0100 Committer: Mikael Ståldal <[email protected]> Committed: Mon Nov 9 17:17:27 2015 +0100 ---------------------------------------------------------------------- log4j-core/src/site/xdoc/index.xml | 2 +- src/site/xdoc/manual/appenders.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
