[03/50] logging-log4j2 git commit: Merge remote-tracking branch 'origin/LOG4J2-1528' into LOG4J2-1528

[rpopma]

Merge remote-tracking branch 'origin/LOG4J2-1528' into LOG4J2-1528

# Conflicts:
#       
log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.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/486823a6
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/486823a6
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/486823a6

Branch: 
refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: 486823a6a23fbbd56f2b38415635c072311c66cd
Parents: ac80524 446fb87
Author: Mikael Ståldal <mik...@staldal.nu>
Authored: Wed Aug 17 22:23:07 2016 +0200
Committer: Mikael Ståldal <mik...@staldal.nu>
Committed: Wed Aug 17 22:23:07 2016 +0200

----------------------------------------------------------------------

----------------------------------------------------------------------