You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/09/08 14:53:35 UTC
[35/35] logging-log4j2 git commit: Merge branch 'master' into
LOG4J2-1349-gcfree-threadcontext
Merge branch 'master' into LOG4J2-1349-gcfree-threadcontext
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/46714209
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/46714209
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/46714209
Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext
Commit: 467142097fb973900a9dc6e31c3c019d6a9a82a6
Parents: 523df26 d1e2e96
Author: rpopma <rp...@apache.org>
Authored: Thu Sep 8 23:52:46 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Thu Sep 8 23:52:46 2016 +0900
----------------------------------------------------------------------
log4j-api-scala_2.10/pom.xml | 4 +-
log4j-api-scala_2.11/pom.xml | 4 +-
.../simple/SimpleLoggerContextFactory.java | 1 +
.../logging/log4j/core/AbstractLifeCycle.java | 12 +
.../apache/logging/log4j/core/LifeCycle.java | 2 +
.../log4j/core/appender/AbstractManager.java | 436 +++++------
.../core/appender/MemoryMappedFileManager.java | 718 +++++++++----------
.../core/appender/RandomAccessFileManager.java | 432 +++++------
.../rolling/CompositeTriggeringPolicy.java | 41 +-
.../appender/rolling/CronTriggeringPolicy.java | 12 +-
.../rolling/DefaultRolloverStrategy.java | 7 +-
.../rolling/OnStartupTriggeringPolicy.java | 1 -
.../rolling/RollingRandomAccessFileManager.java | 530 +++++++-------
.../rolling/SizeBasedTriggeringPolicy.java | 1 -
.../rolling/TimeBasedTriggeringPolicy.java | 1 -
.../core/appender/rolling/TriggeringPolicy.java | 6 +-
.../core/appender/routing/IdlePurgePolicy.java | 6 +-
.../core/appender/routing/PurgePolicy.java | 6 +-
.../builder/api/ConfigurationBuilder.java | 10 +-
.../impl/DefaultConfigurationBuilder.java | 2 +-
.../log4j/core/net/TcpSocketManager.java | 654 ++++++++---------
.../apache/logging/log4j/core/util/Closer.java | 4 +-
.../log4j/core/util/NullOutputStream.java | 16 +-
.../logging/log4j/core/util/WatchManager.java | 4 +-
.../appender/RandomAccessFileManagerTest.java | 8 +-
.../db/AbstractDatabaseAppenderTest.java | 8 +-
.../db/AbstractDatabaseManagerTest.java | 18 +-
.../RollingRandomAccessFileManagerTest.java | 6 +-
.../builder/ConfigurationBuilderTest.java | 49 +-
.../nosql/appender/NoSqlDatabaseManager.java | 441 ++++++------
pom.xml | 2 +-
src/changes/changes.xml | 3 +
32 files changed, 1740 insertions(+), 1705 deletions(-)
----------------------------------------------------------------------