You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by rg...@apache.org on 2017/11/24 20:00:01 UTC

[11/11] flume git commit: Merge branch 'trunk' into flume-2050

Merge branch 'trunk' into flume-2050


Project: http://git-wip-us.apache.org/repos/asf/flume/repo
Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/fbc7a68e
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/fbc7a68e
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/fbc7a68e

Branch: refs/heads/trunk
Commit: fbc7a68e7e8cafe3265af649f6c56f665fd10b19
Parents: 6813d9c d116f97
Author: Ralph Goers <rg...@apache.org>
Authored: Fri Nov 24 11:00:32 2017 -0700
Committer: Ralph Goers <rg...@apache.org>
Committed: Fri Nov 24 11:00:32 2017 -0700

----------------------------------------------------------------------
 .../channel/kafka/TestBasicFunctionality.java   | 213 +++++
 .../flume/channel/kafka/TestKafkaChannel.java   | 897 -------------------
 .../channel/kafka/TestKafkaChannelBase.java     | 272 ++++++
 .../channel/kafka/TestOffsetsAndMigration.java  | 194 ++++
 .../channel/kafka/TestParseAsFlumeEvent.java    | 132 +++
 .../flume/channel/kafka/TestPartitions.java     | 179 ++++
 .../flume/channel/kafka/TestRollback.java       |  84 ++
 .../flume-ng-morphline-solr-sink/pom.xml        |   5 -
 pom.xml                                         |  10 +-
 9 files changed, 1079 insertions(+), 907 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flume/blob/fbc7a68e/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/flume/blob/fbc7a68e/pom.xml
----------------------------------------------------------------------