Merge branch 'master' into LOG4J-1181

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

Branch: refs/heads/LOG4J-1181
Commit: a827f3fd5fb65641eae5a97ffec6ba07dc09773a
Parents: 816c928 525d3d6
Author: Mikael StÃ¥ldal <[email protected]>
Authored: Sun Jun 12 12:12:18 2016 +0200
Committer: Mikael StÃ¥ldal <[email protected]>
Committed: Sun Jun 12 12:12:18 2016 +0200

----------------------------------------------------------------------
 .../java/org/apache/logging/log4j/Logger.java   |   6 +-
 .../log4j/message/ParameterFormatter.java       |  21 ++++
 .../logging/log4j/spi/AbstractLogger.java       |  24 +---
 .../apache/logging/log4j/util/Constants.java    |  61 ++++++++++
 .../org/apache/logging/log4j/util/Unbox.java    |  46 +++++++-
 .../log4j/core/appender/AsyncAppender.java      |   3 +
 .../core/appender/RollingFileAppender.java      |   2 +
 .../RollingRandomAccessFileAppender.java        |   2 +
 .../appender/rolling/RollingFileManager.java    |   3 +
 .../rolling/RollingRandomAccessFileManager.java |   6 +-
 .../logging/log4j/core/util/Constants.java      |   6 +-
 .../AsyncAppenderQueueFullPolicyTest.java       |  29 +++--
 .../rolling/OnStartupTriggeringPolicyTest.java  |   1 +
 .../RandomRollingAppenderOnStartupTest.java     | 110 +++++++++++++++++++
 .../rolling/RollingAppenderOnStartupTest.java   |  21 +++-
 .../rolling/RollingAppenderSizeTest.java        |  35 +++++-
 .../log4j/test/appender/BlockingAppender.java   |   1 +
 log4j-core/src/test/resources/log4j-test5.xml   |  36 ++++++
 .../logging/log4j/perf/jmh/UnboxBenchmark.java  |  91 +++++++++++++++
 pom.xml                                         |   3 +-
 src/changes/changes.xml                         |  20 ++++
 src/site/xdoc/articles.xml                      |   4 +
 src/site/xdoc/manual/extending.xml              |  10 +-
 23 files changed, 480 insertions(+), 61 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a827f3fd/pom.xml
----------------------------------------------------------------------

Reply via email to