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

[ggregory]

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/090d63ad
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/090d63ad
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/090d63ad

Branch: refs/heads/LOG4J2-1553
Commit: 090d63ad192d3fedbde20aa4578ebab8571c29e9
Parents: 244b79b e73d9d4
Author: Mikael Ståldal <mik...@staldal.nu>
Authored: Sun Aug 21 20:14:36 2016 +0200
Committer: Mikael Ståldal <mik...@staldal.nu>
Committed: Sun Aug 21 20:14:36 2016 +0200

----------------------------------------------------------------------
 .../impl/DefaultConfigurationBuilder.java       | 16 ++++++------
 .../builder/ConfigurationAssemblerTest.java     | 27 ++++++++++++++++----
 .../builder/CustomConfigurationFactory.java     |  6 ++---
 3 files changed, 33 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/090d63ad/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
----------------------------------------------------------------------