[2/2] logging-log4j2 git commit: Merge branch 'master' into LOG4J2-1442

[mikes]

Merge branch 'master' into LOG4J2-1442


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/0af515f3
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/0af515f3
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/0af515f3

Branch: refs/heads/LOG4J2-1442
Commit: 0af515f3b1ec67422de254d08ac87b135e3c6923
Parents: 410f9d3 9ce722c
Author: Mikael Ståldal <mikael.stal...@magine.com>
Authored: Thu May 4 14:49:15 2017 +0200
Committer: Mikael Ståldal <mikael.stal...@magine.com>
Committed: Thu May 4 14:49:15 2017 +0200

----------------------------------------------------------------------
 .../core/appender/mom/kafka/KafkaAppender.java  | 42 +++++++++++---------
 .../core/appender/mom/kafka/KafkaManager.java   |  2 +-
 src/site/xdoc/manual/api.xml                    | 15 +++----
 3 files changed, 32 insertions(+), 27 deletions(-)
----------------------------------------------------------------------