[7/8] logging-log4j2 git commit: Merge branch 'master' into LOG4J2-1395

[mikes]

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

Branch: refs/heads/LOG4J2-1395
Commit: d0dacc513de20d719b0c2e99f4f071b6efdcebad
Parents: 349c5eb 0cf1df0
Author: Mikael Ståldal <mikael.stal...@magine.com>
Authored: Mon Jun 13 20:41:00 2016 +0200
Committer: Mikael Ståldal <mikael.stal...@magine.com>
Committed: Mon Jun 13 20:41:00 2016 +0200

----------------------------------------------------------------------
 .../logging/log4j/core/LoggerContext.java       |  5 +++
 .../logging/log4j/core/async/AsyncLogger.java   |  1 -
 src/site/xdoc/articles.xml                      | 33 ++++++++++++++++++++
 src/site/xdoc/manual/configuration.xml.vm       |  6 ++++
 4 files changed, 44 insertions(+), 1 deletion(-)
----------------------------------------------------------------------