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 <[email protected]> Authored: Fri Nov 24 11:00:32 2017 -0700 Committer: Ralph Goers <[email protected]> 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 ----------------------------------------------------------------------
