[4/5] logging-log4j2 git commit: Merge branch 'master' into LOG4J2-1958

[mikes]

Merge branch 'master' into LOG4J2-1958


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

Branch: refs/heads/LOG4J2-1958
Commit: 002a19332c6f3cbbecdd93a4310e498bd24bee8e
Parents: 13b714d 7444973
Author: Mikael Ståldal <mik...@staldal.nu>
Authored: Thu Jun 29 17:42:55 2017 +0200
Committer: Mikael Ståldal <mik...@staldal.nu>
Committed: Thu Jun 29 17:42:55 2017 +0200

----------------------------------------------------------------------
 .../core/appender/mom/activemq/JmsAppenderConnectLaterIT.java     | 1 +
 src/changes/announcement.vm                                       | 3 +++
 src/site/xdoc/manual/configuration.xml.vm                         | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------