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/27c0f862 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/27c0f862 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/27c0f862 Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure Commit: 27c0f862b602727c2a751f8da2733e53d48425c9 Parents: 403bb13 5b01d11 Author: Mikael Ståldal <mikael.stal...@magine.com> Authored: Thu Jul 7 13:26:13 2016 +0200 Committer: Mikael Ståldal <mikael.stal...@magine.com> Committed: Thu Jul 7 13:26:13 2016 +0200 ---------------------------------------------------------------------- RELEASE-NOTES.txt | 66 +- log4j-1.2-api/pom.xml | 2 +- log4j-api/pom.xml | 2 +- log4j-bom/pom.xml | 2 +- log4j-core/pom.xml | 2 +- .../appender/rolling/CronTriggeringPolicy.java | 37 +- .../rolling/DefaultRolloverStrategy.java | 9 +- .../rolling/OnStartupTriggeringPolicy.java | 3 + .../core/appender/rolling/PatternProcessor.java | 12 +- .../appender/rolling/RollingFileManager.java | 10 + .../rolling/action/CommonsCompressAction.java | 9 +- .../rolling/action/FileRenameAction.java | 68 +- .../core/config/ConfigurationScheduler.java | 24 +- .../log4j/core/config/CronScheduledFuture.java | 43 +- .../log4j/core/filter/AbstractFilter.java | 3 +- .../log4j/core/filter/ThresholdFilter.java | 16 +- .../log4j/core/layout/PatternLayout.java | 15 +- .../rolling/OnStartupTriggeringPolicyTest.java | 23 +- .../rolling/RollingAppenderCronTest.java | 9 + .../rolling/RollingAppenderSizeTest.java | 6 + .../logging/log4j/junit/CleanFolders.java | 28 +- log4j-distribution/pom.xml | 2 +- log4j-flume-ng/pom.xml | 2 +- log4j-iostreams/pom.xml | 2 +- log4j-jcl/pom.xml | 2 +- log4j-jmx-gui/pom.xml | 2 +- log4j-jul/pom.xml | 2 +- log4j-liquibase/pom.xml | 2 +- log4j-nosql/pom.xml | 2 +- log4j-perf/pom.xml | 2 +- log4j-samples/configuration/pom.xml | 2 +- log4j-samples/flume-common/pom.xml | 2 +- log4j-samples/flume-embedded/pom.xml | 2 +- log4j-samples/flume-remote/pom.xml | 2 +- log4j-samples/loggerProperties/pom.xml | 2 +- log4j-samples/pom.xml | 2 +- log4j-slf4j-impl/pom.xml | 2 +- log4j-taglib/pom.xml | 2 +- log4j-to-slf4j/pom.xml | 2 +- log4j-web/pom.xml | 2 +- pom.xml | 10 +- src/changes/announcement.vm | 2 +- src/changes/changes.xml | 5562 +++++++++--------- src/site/apt/download.apt.vm | 15 + src/site/resources/images/logo.png | Bin 41622 -> 40736 bytes src/site/resources/logo/logo-java-2-2.6.2.png | Bin 0 -> 40736 bytes src/site/resources/logo/logo-java-2-2.6.2.xcf | Bin 0 -> 66719 bytes src/site/site.xml | 5 + 48 files changed, 3101 insertions(+), 2920 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/27c0f862/log4j-bom/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/27c0f862/log4j-samples/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/27c0f862/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/27c0f862/src/site/site.xml ----------------------------------------------------------------------