Merge branch 'master' into LOG4J2-1694
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1c2ad7b8 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1c2ad7b8 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1c2ad7b8 Branch: refs/heads/LOG4J2-1694 Commit: 1c2ad7b807c3a34039206e17f3f71be6b6dc5216 Parents: 0166ac2 ffb21ad Author: Mikael Ståldal <mikael.stal...@magine.com> Authored: Fri Apr 28 11:19:28 2017 +0200 Committer: Mikael Ståldal <mikael.stal...@magine.com> Committed: Fri Apr 28 11:19:28 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/logging/log4j/core/layout/GelfLayout.java | 5 +++-- src/site/xdoc/manual/layouts.xml.vm | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
