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

[mikes]

Merge branch 'master' into LOG4J2-1528


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

Branch: refs/heads/LOG4J2-1528
Commit: 7ab63d49d935d481048f78d7a80bb2be13da2693
Parents: 634df7c f7298ce
Author: Mikael Ståldal <mik...@staldal.nu>
Authored: Sun Aug 21 19:14:56 2016 +0200
Committer: Mikael Ståldal <mik...@staldal.nu>
Committed: Sun Aug 21 19:14:56 2016 +0200

----------------------------------------------------------------------
 .../builder/impl/DefaultCustomLevelComponentBuilder.java     | 2 +-
 .../core/config/builder/ConfigurationAssemblerTest.java      | 8 ++++++++
 .../core/config/builder/CustomConfigurationFactory.java      | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------