Merge remote-tracking branch 'origin/master' into LOG4J2-1547-AbstractConfiguration-with-LoggerContext
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/56eba730 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/56eba730 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/56eba730 Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure Commit: 56eba730fdc36beaab05f6e9077f752d138125f1 Parents: 85c5e81 30ea283 Author: Gary Gregory <ggreg...@apache.org> Authored: Tue Aug 23 21:12:00 2016 -0700 Committer: Gary Gregory <ggreg...@apache.org> Committed: Tue Aug 23 21:12:00 2016 -0700 ---------------------------------------------------------------------- .../core/config/AbstractConfiguration.java | 26 ++++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/56eba730/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java ----------------------------------------------------------------------
