Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Conflicts:
log4j-1.2-api/src/test/java/org/apache/log4j/config/AbstractLog4j1ConfigurationConverterTest.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/60833808
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/60833808
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/60833808
Branch: refs/heads/master
Commit: 60833808d86f2b2ed1604f37dab124af31ca6736
Parents: 8a78a99 82676b5
Author: Gary Gregory <[email protected]>
Authored: Fri Sep 23 23:44:13 2016 -0700
Committer: Gary Gregory <[email protected]>
Committed: Fri Sep 23 23:44:13 2016 -0700
----------------------------------------------------------------------
.../log4j/config/AbstractLog4j1ConfigurationConverterTest.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/60833808/log4j-1.2-api/src/test/java/org/apache/log4j/config/AbstractLog4j1ConfigurationConverterTest.java
----------------------------------------------------------------------
