Merge remote-tracking branch 'remotes/origin/master' into LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a12913d7 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a12913d7 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a12913d7 Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure Commit: a12913d7ca2c109e31cc2c65eca1631d8b0d6d81 Parents: 6b5a80a c0cb21e Author: rpopma <rpo...@apache.org> Authored: Fri Aug 12 21:11:44 2016 +0900 Committer: rpopma <rpo...@apache.org> Committed: Fri Aug 12 21:11:44 2016 +0900 ---------------------------------------------------------------------- src/site/xdoc/manual/layouts.xml.vm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ----------------------------------------------------------------------