Merge branch 'release-2.x' of https://git-wip-us.apache.org/repos/asf/logging-log4j2 into release-2.x
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/046a5cfa Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/046a5cfa Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/046a5cfa Branch: refs/heads/release-2.x Commit: 046a5cfafeefd844bf23344dfac93c174abb59ab Parents: fe914a1 1d70d31 Author: rgoers <ralph.go...@dslextreme.com> Authored: Sun Mar 11 15:32:49 2018 -0700 Committer: rgoers <ralph.go...@dslextreme.com> Committed: Sun Mar 11 15:32:49 2018 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/logging/log4j/util/LoaderUtil.java | 3 ++- src/changes/changes.xml | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) ----------------------------------------------------------------------