Merge branch 'master' into LOG4J2-1986
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b96f5220 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b96f5220 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b96f5220 Branch: refs/heads/LOG4J2-1986 Commit: b96f5220dbebf6e0a4fb9f7da07c3a9d7d443418 Parents: d3b7220 b464da6 Author: Mikael Ståldal <[email protected]> Authored: Wed Jul 26 20:41:41 2017 +0200 Committer: Mikael Ståldal <[email protected]> Committed: Wed Jul 26 20:41:41 2017 +0200 ---------------------------------------------------------------------- .../logging/log4j/util/StringBuilders.java | 2 +- .../logging/log4j/util/StringBuildersTest.java | 14 + .../rolling/DefaultRolloverStrategy.java | 5 +- .../rolling/DirectWriteRolloverStrategy.java | 5 +- .../logging/log4j/core/tools/Generate.java | 1724 +++++++++--------- .../core/layout/AbstractStringLayoutTest.java | 29 +- .../org/apache/logging/log4j/jul/ApiLogger.java | 12 +- src/changes/changes.xml | 6 + 8 files changed, 925 insertions(+), 872 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b96f5220/src/changes/changes.xml ----------------------------------------------------------------------
