[8/8] logging-log4j2 git commit: Merge branch 'master' into LOG4J2-1356

[mikes]

Merge branch 'master' into LOG4J2-1356


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

Branch: refs/heads/LOG4J2-1356
Commit: a91a54b955e89efee34fcaaa17bcab66edfc4b9c
Parents: 7c990c4 b69cbbc
Author: Mikael Ståldal <mik...@staldal.nu>
Authored: Sat Apr 9 13:49:30 2016 +0200
Committer: Mikael Ståldal <mik...@staldal.nu>
Committed: Sat Apr 9 13:49:30 2016 +0200

----------------------------------------------------------------------
 .../appender/AbstractOutputStreamAppender.java  | 14 +++---
 .../core/appender/OutputStreamManager.java      |  5 ++-
 .../core/appender/RandomAccessFileManager.java  |  2 +-
 .../rolling/RollingRandomAccessFileManager.java |  2 +-
 .../log4j/core/layout/AbstractStringLayout.java | 47 ++++++++++----------
 .../log4j/core/layout/TextEncoderHelper.java    | 20 +++++----
 ...RandomAccessFileManagerHeaderFooterTest.java |  5 ++-
 7 files changed, 52 insertions(+), 43 deletions(-)
----------------------------------------------------------------------