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

Branch: refs/heads/master
Commit: f68acc5c77f0ac490fe3639f75061fe910fe26f9
Parents: 02cde27 aaaaaad
Author: Mikael Ståldal <mikael.stal...@magine.com>
Authored: Thu Apr 14 16:02:24 2016 +0200
Committer: Mikael Ståldal <mikael.stal...@magine.com>
Committed: Thu Apr 14 16:02:24 2016 +0200

----------------------------------------------------------------------
 .../log4j/perf/jmh/GelfLayoutBenchmark.java     | 67 +++++++++++++-----
 .../logging/log4j/perf/util/DemoAppender.java   | 71 ++++++++++++++++++++
 .../src/main/resources/log4j2-gelf-perf.xml     | 30 ---------
 3 files changed, 122 insertions(+), 46 deletions(-)
----------------------------------------------------------------------