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/da5ff32f Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/da5ff32f Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/da5ff32f Branch: refs/heads/LOG4J-1181 Commit: da5ff32fad97459023daabd2d2a56b14fec32931 Parents: 2244ea8 a212f6b Author: Mikael Ståldal <[email protected]> Authored: Wed Nov 18 17:12:47 2015 +0100 Committer: Mikael Ståldal <[email protected]> Committed: Wed Nov 18 17:12:47 2015 +0100 ---------------------------------------------------------------------- .../log4j/core/appender/rolling/DefaultRolloverStrategy.java | 8 ++++++-- .../org/apache/logging/log4j/core/layout/PatternLayout.java | 3 --- .../log4j/nosql/appender/mongodb/MongoDbConnection.java | 5 ++--- src/changes/changes.xml | 3 +++ 4 files changed, 11 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
