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

[rpopma]

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

Branch: 
refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: e0f5ec45099de8cb669c8b8327bcb9f003d3edc0
Parents: 5f361e0 520170c
Author: Mikael Ståldal <mik...@staldal.nu>
Authored: Sun Aug 21 17:10:03 2016 +0200
Committer: Mikael Ståldal <mik...@staldal.nu>
Committed: Sun Aug 21 17:10:03 2016 +0200

----------------------------------------------------------------------
 .../config/Log4j1ConfigurationFactory.java      | 312 +------------------
 .../log4j/config/Log4j1ConfigurationParser.java | 301 ++++++++++++++++++
 ...g4j-console-EnhancedPatternLayout.properties |   2 +-
 .../PropertiesConfigurationFactory.java         |   3 +-
 4 files changed, 317 insertions(+), 301 deletions(-)
----------------------------------------------------------------------