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/d7d88b13 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d7d88b13 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d7d88b13 Branch: refs/heads/LOG4J2-1442 Commit: d7d88b13c5ee60572387e500442f2396fe616718 Parents: 422d090 2633291 Author: Gary Gregory <[email protected]> Authored: Sat May 6 12:46:34 2017 -0700 Committer: Gary Gregory <[email protected]> Committed: Sat May 6 12:46:34 2017 -0700 ---------------------------------------------------------------------- BUILDING.md | 12 +- .../logging/log4j/core/SimplePerfTest.java | 2 +- .../logging/log4j/core/ThreadedPerfTest.java | 2 +- .../apache/logging/log4j/core/util/Timer.java | 273 ------------------- src/site/markdown/build.md | 3 +- toolchains-sample-linux.xml | 52 ++++ 6 files changed, 65 insertions(+), 279 deletions(-) ----------------------------------------------------------------------
