Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4c6d636b Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4c6d636b Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4c6d636b Branch: refs/heads/master Commit: 4c6d636b669b10753a214c4af869b0dbe7386f18 Parents: 62ce932 3d92506 Author: Gary Gregory <[email protected]> Authored: Sun Jun 14 12:11:47 2015 -0700 Committer: Gary Gregory <[email protected]> Committed: Sun Jun 14 12:11:47 2015 -0700 ---------------------------------------------------------------------- src/site/site.xml | 1 + src/site/xdoc/manual/configuration.xml.vm | 4 +++- src/site/xdoc/manual/lookups.xml | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
