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 2015/09/24 10:51:25 UTC

[32/35] 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/4b3296c1
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4b3296c1
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4b3296c1

Branch: refs/heads/master
Commit: 4b3296c10184f27cf223141d14f27c8986fa0a9b
Parents: 5f80bf6 47f70fe
Author: rpopma <rp...@apache.org>
Authored: Thu Sep 24 10:37:35 2015 +0200
Committer: rpopma <rp...@apache.org>
Committed: Thu Sep 24 10:37:35 2015 +0200

----------------------------------------------------------------------
 .../log4j/core/async/AsyncLoggerConfig.java     |   4 +-
 .../core/config/AbstractConfiguration.java      |   9 +-
 .../logging/log4j/core/config/LoggerConfig.java |   8 +-
 .../impl/DefaultConfigurationBuilder.java       |   3 +-
 .../core/config/json/JsonConfiguration.java     |   5 +-
 .../core/config/plugins/util/PluginBuilder.java |   1 -
 .../PropertiesConfigurationFactory.java         |   3 +-
 .../logging/log4j/core/impl/Log4jLogEvent.java  |   3 +-
 .../logging/log4j/core/layout/HtmlLayout.java   |   3 +-
 .../nosql/appender/AbstractNoSqlConnection.java |  48 ++
 .../appender/couchdb/CouchDbConnection.java     | 145 +++---
 .../appender/mongodb/MongoDbConnection.java     |  51 +--
 .../nosql/appender/mongodb/MongoDbProvider.java |  48 +-
 .../log4j/nosql/appender/MongoDbAuthTest.java   |  37 ++
 .../src/test/resources/log4j2-mongodb-auth.xml  |  30 ++
 pom.xml                                         |   2 +-
 src/changes/changes.xml                         |   9 +-
 src/site/xdoc/manual/plugins.xml                | 456 +++++++++----------
 18 files changed, 475 insertions(+), 390 deletions(-)
----------------------------------------------------------------------