Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/2ede23ae Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/2ede23ae Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/2ede23ae Branch: refs/heads/master Commit: 2ede23aef242313c57399f2fe8b4d3bb7a1dfbbc Parents: de34357 ad7b5ab Author: rpopma <[email protected]> Authored: Sun May 22 16:07:52 2016 +0900 Committer: rpopma <[email protected]> Committed: Sun May 22 16:07:52 2016 +0900 ---------------------------------------------------------------------- .../config/composite/DefaultMergeStrategy.java | 6 ++++- .../core/config/CompositeConfigurationTest.java | 8 +++---- .../src/test/resources/log4j-comp-logger.json | 8 ++++++- log4j-perf/perf.txt | 23 -------------------- .../log4j/web/ServletRequestThreadContext.java | 16 ++++++++++++++ pom.xml | 6 +++++ 6 files changed, 38 insertions(+), 29 deletions(-) ----------------------------------------------------------------------
