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/f063d914 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f063d914 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f063d914 Branch: refs/heads/master Commit: f063d914bf515992aa1a1fc3341eafc0627d2ad3 Parents: 6cb7bd7 b283e3b Author: rpopma <[email protected]> Authored: Sat Sep 27 22:35:14 2014 +0900 Committer: rpopma <[email protected]> Committed: Sat Sep 27 22:35:14 2014 +0900 ---------------------------------------------------------------------- .../apache/logging/log4j/message/MessageFormatMessage.java | 2 +- .../org/apache/logging/log4j/message/ObjectMessageTest.java | 1 + .../apache/logging/log4j/message/ThreadDumpMessageTest.java | 1 + .../logging/log4j/core/appender/MemoryMappedFileManager.java | 1 + .../log4j/core/appender/db/AbstractDatabaseManager.java | 1 + .../appender/rolling/RollingRandomAccessFileManager.java | 1 + .../java/org/apache/logging/log4j/core/tools/Generate.java | 8 ++++++++ .../logging/log4j/test/appender/UsesLoggingAppender.java | 1 + 8 files changed, 15 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
