Merge remote-tracking branch 'origin/LOG4J2-589' Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c5a3e893 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c5a3e893 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c5a3e893
Branch: refs/heads/master Commit: c5a3e893c326510c5b54fe6899bfa21f344b6ed3 Parents: 0091f1a ba3feb2 Author: rpopma <[email protected]> Authored: Sat Sep 27 20:53:14 2014 +0900 Committer: rpopma <[email protected]> Committed: Sat Sep 27 20:53:14 2014 +0900 ---------------------------------------------------------------------- .../core/config/AbstractConfiguration.java | 19 ++- .../log4j/core/config/Configuration.java | 30 ++++- .../log4j/core/config/CustomLevelConfig.java | 99 ++++++++++++++++ .../logging/log4j/core/config/CustomLevels.java | 59 ++++++++++ log4j-core/src/main/resources/Log4j-config.xsd | 13 ++ src/site/site.xml | 2 + src/site/xdoc/manual/customloglevels.xml.vm | 118 +++++++++++++++++-- 7 files changed, 322 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c5a3e893/src/site/site.xml ----------------------------------------------------------------------
