Merge branch 'master' into LOG4J2-1347

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

Branch: refs/heads/master
Commit: d9f2a3447b1b267dbdc5f8d92e16c5d34c21edd2
Parents: 1b134cf 21a9a13
Author: Mikael StÃ¥ldal <[email protected]>
Authored: Fri Apr 29 16:32:15 2016 +0200
Committer: Mikael StÃ¥ldal <[email protected]>
Committed: Fri Apr 29 16:32:15 2016 +0200

----------------------------------------------------------------------
 README.md                                       |   2 +-
 .../core/async/perftest/ResponseTimeTest.java   |  72 +++++++++++------
 .../ResponseTimeAsyncClassicVsGcFree-label.png  | Bin 0 -> 31517 bytes
 .../images/ResponseTimeSyncClassicVsGcFree.png  | Bin 0 -> 38428 bytes
 src/site/xdoc/manual/appenders.xml              |   4 +-
 src/site/xdoc/manual/garbagefree.xml            |  81 ++++++++++++++++---
 6 files changed, 119 insertions(+), 40 deletions(-)
----------------------------------------------------------------------


Reply via email to