[05/12] logging-log4j2 git commit: Merge branch 'master' into LOG4J2-1365

[mikes]

Merge branch 'master' into LOG4J2-1365


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

Branch: refs/heads/master
Commit: 02cde27594d15128b4a958bb0192d31b84512cb8
Parents: 5f52590 8f5e275
Author: Mikael Ståldal <mikael.stal...@magine.com>
Authored: Thu Apr 14 15:13:02 2016 +0200
Committer: Mikael Ståldal <mikael.stal...@magine.com>
Committed: Thu Apr 14 15:13:02 2016 +0200

----------------------------------------------------------------------
 .../log4j/perf/jmh/GelfLayoutBenchmark.java     | 75 ++++++++++++++++++++
 .../src/main/resources/log4j2-gelf-perf.xml     | 30 ++++++++
 2 files changed, 105 insertions(+)
----------------------------------------------------------------------