Merge branch 'master' into LOG4J2-649
Conflicts:
log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HangingAppender.java
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/13bb3d9f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/13bb3d9f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/13bb3d9f
Branch: refs/heads/LOG4J2-649
Commit: 13bb3d9fa7ac975f59f912d27aae6077e5d9f646
Parents: 673b1f9 5a14032
Author: Mikael Ståldal <mikael.stal...@magine.com>
Authored: Wed Dec 2 10:42:49 2015 +0100
Committer: Mikael Ståldal <mikael.stal...@magine.com>
Committed: Wed Dec 2 10:42:49 2015 +0100
----------------------------------------------------------------------
.../log4j/core/appender/HangingAppender.java | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
