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/cc0bf0b4 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/cc0bf0b4 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/cc0bf0b4 Branch: refs/heads/LOG4J2-1528 Commit: cc0bf0b46232a88dc7b83a68183f6987b2809422 Parents: 3aceb2a e033027 Author: Mikael Ståldal <mik...@staldal.nu> Authored: Thu Aug 25 22:29:13 2016 +0200 Committer: Mikael Ståldal <mik...@staldal.nu> Committed: Thu Aug 25 22:29:13 2016 +0200 ---------------------------------------------------------------------- .../core/config/plugins/util/ResolverUtil.java | 11 +- .../plugins/util/PluginManagerPackagesTest.java | 2 +- .../util/ResolverUtilCustomProtocolTest.java | 208 +++++++++++++++++++ .../config/plugins/util/ResolverUtilTest.java | 146 +++++++------ .../junit/URLStreamHandlerFactoryRule.java | 96 +++++++++ src/changes/changes.xml | 2 +- 6 files changed, 400 insertions(+), 65 deletions(-) ----------------------------------------------------------------------