[20/21] logging-log4j2 git commit: Merge branch 'master' into LOG4J-1012

[mikes]

Merge branch 'master' into LOG4J-1012


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

Branch: refs/heads/LOG4J-1012
Commit: 8ca0c01953fccf5949934c31e99166bfdd7cbfd7
Parents: db31dad 2946d57
Author: Mikael Ståldal <mikael.stal...@magine.com>
Authored: Tue Sep 29 13:37:47 2015 +0200
Committer: Mikael Ståldal <mikael.stal...@magine.com>
Committed: Tue Sep 29 13:37:47 2015 +0200

----------------------------------------------------------------------
 .../rolling/DefaultRolloverStrategy.java        | 56 ++++++++++-------
 .../core/config/AbstractConfiguration.java      | 42 ++++++-------
 .../core/jackson/ListOfMapEntrySerializer.java  |  9 ++-
 .../log4j/core/jackson/MessageSerializer.java   |  2 +
 .../net/server/InputStreamLogEventBridge.java   |  2 +-
 .../apache/logging/log4j/MarkerMixInTest.java   |  2 +-
 .../rolling/RollingAppenderSizeTest.java        | 63 +++++++++++++++-----
 ...RandomAccessFileManagerHeaderFooterTest.java |  2 +-
 .../log4j/core/jackson/LevelMixInTest.java      |  4 +-
 .../core/tools/GenerateExtendedLoggerTest.java  | 29 ++++-----
 .../log4j/test/appender/DeadlockAppender.java   |  2 +
 .../logging/log4j/test/layout/BasicLayout.java  |  1 +
 pom.xml                                         |  4 +-
 src/changes/changes.xml                         |  9 +++
 14 files changed, 143 insertions(+), 84 deletions(-)
----------------------------------------------------------------------