Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d82dba5d Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d82dba5d Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d82dba5d Branch: refs/heads/master Commit: d82dba5d8213562217a7a681674409d46dbdb4ae Parents: 5dda63d d329cf3 Author: rgoers <[email protected]> Authored: Sun Feb 22 14:41:33 2015 -0700 Committer: rgoers <[email protected]> Committed: Sun Feb 22 14:41:33 2015 -0700 ---------------------------------------------------------------------- .../apache/logging/log4j/core/jmx/Server.java | 58 +++++++++++++------- src/changes/changes.xml | 5 ++ src/site/xdoc/faq.xml | 5 +- src/site/xdoc/manual/configuration.xml.vm | 10 ++++ 4 files changed, 56 insertions(+), 22 deletions(-) ----------------------------------------------------------------------
