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/28af48ef Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/28af48ef Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/28af48ef Branch: refs/heads/LOG4J-1181 Commit: 28af48efb4725ecbdf7dd6a4dd1d575e8dca2043 Parents: 4b3d073 c5d1718 Author: rpopma <[email protected]> Authored: Sun Nov 29 11:34:04 2015 +0900 Committer: rpopma <[email protected]> Committed: Sun Nov 29 11:34:04 2015 +0900 ---------------------------------------------------------------------- .../log4j/core/script/ScriptManager.java | 47 ++++++++++++++++---- 1 file changed, 39 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
