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/155dfc73 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/155dfc73 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/155dfc73 Branch: refs/heads/master Commit: 155dfc739211f3262fc089c56da939393b4ed80b Parents: 2d73111 794c469 Author: rpopma <[email protected]> Authored: Thu Jun 18 00:21:16 2015 +0900 Committer: rpopma <[email protected]> Committed: Thu Jun 18 00:21:16 2015 +0900 ---------------------------------------------------------------------- doap_log4j2.rdf | 66 ++++++++++++++++++ .../log4j/core/config/ConfigurationFactory.java | 48 +++++++++---- .../log4j/core/BasicConfigurationFactory.java | 4 +- .../log4j/flume/appender/FlumeAppender.java | 4 +- .../log4j/flume/appender/FlumeAvroManager.java | 71 ++++++++++++++------ .../flume/appender/FlumePersistentManager.java | 15 ++--- .../log4j/flume/appender/FlumeAppenderTest.java | 41 +++++++++++ .../ext/logging/log4j2/Log4j2Logger.java | 2 +- src/changes/changes.xml | 6 ++ src/site/xdoc/articles.xml | 4 ++ 10 files changed, 211 insertions(+), 50 deletions(-) ----------------------------------------------------------------------
