You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@logging.apache.org by mi...@apache.org on 2015/12/03 11:14:55 UTC

[3/5] logging-log4j2 git commit: Merge branch 'master' into LOG4J2-649

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/master
Commit: 13bb3d9fa7ac975f59f912d27aae6077e5d9f646
Parents: 673b1f9 5a14032
Author: Mikael Ståldal <mi...@magine.com>
Authored: Wed Dec 2 10:42:49 2015 +0100
Committer: Mikael Ståldal <mi...@magine.com>
Committed: Wed Dec 2 10:42:49 2015 +0100

----------------------------------------------------------------------
 .../log4j/core/appender/HangingAppender.java       | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------