You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2017/06/29 15:50:23 UTC
[2/5] logging-log4j2 git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/04acee20
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/04acee20
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/04acee20
Branch: refs/heads/LOG4J2-1958
Commit: 04acee201919ce57d99009b625b5e91a8d9e052c
Parents: 5d1b605 594e573
Author: Gary Gregory <gg...@apache.org>
Authored: Wed Jun 28 19:12:29 2017 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Wed Jun 28 19:12:29 2017 -0700
----------------------------------------------------------------------
.../log4j/core/config/xml/XmlConfiguration.java | 11 ++++++
.../config/xml/XmlConigurationSecurity.java | 36 ++++++++++++++++++++
.../test/resources/XmlConfigurationSecurity.xml | 34 ++++++++++++++++++
src/changes/changes.xml | 3 ++
src/site/xdoc/manual/configuration.xml.vm | 5 +++
5 files changed, 89 insertions(+)
----------------------------------------------------------------------