You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2016/03/01 16:50:38 UTC

[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/0434a271
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/0434a271
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/0434a271

Branch: refs/heads/master
Commit: 0434a271338a0f2defa345f5570cff9544be7693
Parents: 82d2722 8717cad
Author: ggregory <gg...@apache.org>
Authored: Tue Mar 1 07:50:07 2016 -0800
Committer: ggregory <gg...@apache.org>
Committed: Tue Mar 1 07:50:07 2016 -0800

----------------------------------------------------------------------
 .../logging/log4j/core/LoggerContext.java       |  1 -
 .../core/appender/db/jdbc/JdbcAppender.java     |  1 -
 .../log4j/core/appender/db/jpa/JpaAppender.java |  1 -
 .../log4j/core/appender/mom/JmsAppender.java    |  1 -
 .../appender/mom/jeromq/JeroMqAppender.java     |  2 -
 .../core/appender/mom/kafka/KafkaAppender.java  | 10 +-
 .../core/appender/rewrite/RewriteAppender.java  |  2 -
 .../core/appender/routing/IdlePurgePolicy.java  | 99 ++++++++++----------
 .../core/appender/routing/RoutingAppender.java  |  1 -
 .../log4j/core/config/DefaultAdvertiser.java    |  5 +-
 .../core/config/json/JsonConfiguration.java     | 21 ++---
 .../properties/PropertiesConfiguration.java     |  6 +-
 .../log4j/core/config/xml/XmlConfiguration.java |  2 -
 .../core/config/yaml/YamlConfiguration.java     |  2 -
 .../util/DefaultShutdownCallbackRegistry.java   |  4 +-
 .../logging/log4j/core/util/KeyValuePair.java   | 22 +----
 .../logging/log4j/core/util/WatchManager.java   | 11 +--
 .../log4j/web/Log4jWebInitializerImpl.java      |  2 -
 .../log4j/web/appender/ServletAppender.java     |  2 -
 src/changes/changes.xml                         |  3 +
 20 files changed, 75 insertions(+), 123 deletions(-)
----------------------------------------------------------------------