Merge remote-tracking branch 'remotes/origin/master' into LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/6146960e Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6146960e Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6146960e Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure Commit: 6146960e01d3bd694a313b9be29dccea5aa8e7e0 Parents: 917afad dbe8c3a Author: rpopma <[email protected]> Authored: Sat Aug 20 11:11:33 2016 +0900 Committer: rpopma <[email protected]> Committed: Sat Aug 20 11:11:33 2016 +0900 ---------------------------------------------------------------------- .../log4j/core/async/AsyncLoggerDisruptor.java | 2 +- .../config/composite/DefaultMergeStrategy.java | 1 + .../apache/logging/log4j/core/jmx/Server.java | 2 +- .../core/config/CompositeConfigurationTest.java | 34 +++++++++++++-- .../log4j-comp-logger-attr-override.json | 38 +++++++++++++++++ .../test/resources/log4j-comp-logger-root.xml | 44 ++++++++++++++++++++ src/changes/changes.xml | 4 +- 7 files changed, 118 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
