Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/9c9bc95d Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/9c9bc95d Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/9c9bc95d Branch: refs/heads/master Commit: 9c9bc95d348837a1e2e9fdc3619146dba7ebcff7 Parents: 9ebf072 c83366e Author: ggregory <[email protected]> Authored: Tue Mar 1 16:56:25 2016 -0800 Committer: ggregory <[email protected]> Committed: Tue Mar 1 16:56:25 2016 -0800 ---------------------------------------------------------------------- .../core/async/perftest/SimplePerfTest.java | 1 - .../log4j/core/async/perftest/SimplePerfTest.sh | 22 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
