Merge branch 'master' into LOG4J2-1121B-ReliabilityStrategy Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/63323d58 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/63323d58 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/63323d58
Branch: refs/heads/master Commit: 63323d5866bcc62f8d5c4832119f4c2b0638c8d9 Parents: beb9e8c 66b287f Author: rpopma <[email protected]> Authored: Sun Sep 20 10:34:32 2015 +0200 Committer: rpopma <[email protected]> Committed: Sun Sep 20 10:34:32 2015 +0200 ---------------------------------------------------------------------- .../log4j/core/layout/PatternLayout.java | 20 +++++++++++++++----- src/changes/changes.xml | 7 +++++++ 2 files changed, 22 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
