Merge branch 'master' into LOG4J-1181
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/245cc32c Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/245cc32c Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/245cc32c Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext Commit: 245cc32c284162ea480e7c2759685883e6ee6458 Parents: 20598da 48a6dd9 Author: Mikael Ståldal <mik...@staldal.nu> Authored: Mon Jun 27 13:52:04 2016 +0200 Committer: Mikael Ståldal <mik...@staldal.nu> Committed: Mon Jun 27 13:52:04 2016 +0200 ---------------------------------------------------------------------- log4j-api/src/main/java/org/apache/logging/log4j/Logger.java | 2 +- .../apache/logging/log4j/core/pattern/MessagePatternConverter.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
