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/123a5817 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/123a5817 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/123a5817 Branch: refs/heads/LOG4J-1181 Commit: 123a5817a58c963752df9f8b7ebb128e079a009a Parents: 2414d22 52989bf Author: Mikael Ståldal <mikael.stal...@magine.com> Authored: Mon Nov 9 11:06:43 2015 +0100 Committer: Mikael Ståldal <mikael.stal...@magine.com> Committed: Mon Nov 9 11:06:43 2015 +0100 ---------------------------------------------------------------------- .../log4j/simple/SimpleLoggerContext.java | 8 +-- .../logging/log4j/spi/LoggerContextKey.java | 5 ++ .../org/apache/logging/log4j/spi/Provider.java | 40 ++++++++++-- .../apache/logging/log4j/util/ProviderUtil.java | 4 +- .../logging/log4j/core/LoggerContext.java | 8 +-- .../appender/mom/jeromq/JeroMqAppender.java | 3 +- .../core/appender/mom/kafka/KafkaManager.java | 3 +- .../appender/rolling/RollingFileManager.java | 3 +- .../log4j/core/async/DaemonThreadFactory.java | 4 +- .../core/config/AbstractConfiguration.java | 48 +++++++++----- .../core/config/FileConfigurationMonitor.java | 4 +- .../core/net/server/AbstractSocketServer.java | 3 +- .../log4j/core/net/server/TcpSocketServer.java | 3 +- .../log4j/core/net/server/UdpSocketServer.java | 3 +- .../logging/log4j/core/util/CachedClock.java | 2 +- .../log4j/core/util/CoarseCachedClock.java | 2 +- .../logging/log4j/core/util/Log4jThread.java | 69 ++++++++++++++++++++ .../core/net/ssl/SslConfigurationTest.java | 7 +- .../flume/appender/FlumePersistentManager.java | 3 +- .../log4j/taglib/Log4jTaglibLoggerContext.java | 18 +++-- src/changes/changes.xml | 9 +++ src/site/xdoc/manual/appenders.xml | 4 +- 22 files changed, 198 insertions(+), 55 deletions(-) ----------------------------------------------------------------------
