You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2018/02/24 12:01:23 UTC

[2/2] storm git commit: Merge branch 'STORM-2896' of https://github.com/srdo/storm into asfgit-1.x-branch

Merge branch 'STORM-2896' of https://github.com/srdo/storm into asfgit-1.x-branch


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

Branch: refs/heads/1.x-branch
Commit: 3e7a207157bbe62136f84c7ac18a546153c361c9
Parents: d2d25e7 25f8f65
Author: Stig Rohde Døssing <sr...@apache.org>
Authored: Sat Feb 24 13:00:41 2018 +0100
Committer: Stig Rohde Døssing <sr...@apache.org>
Committed: Sat Feb 24 13:00:41 2018 +0100

----------------------------------------------------------------------
 docs/storm-kafka.md                             |   4 +
 external/storm-kafka-migration/README.md        |   8 +
 external/storm-kafka-migration/pom.xml          | 121 +++++++++
 .../conf/example-spout-migration-config.yaml    |  37 +++
 .../example-trident-spout-migration-config.yaml |  35 +++
 .../kafka/migration/KafkaSpoutMigration.java    | 163 ++++++++++++
 .../migration/KafkaTridentSpoutMigration.java   | 248 +++++++++++++++++++
 .../apache/storm/kafka/migration/MapUtil.java   |  34 +++
 external/storm-kafka/README.md                  |   1 +
 .../jvm/org/apache/storm/kafka/KafkaSpout.java  |   1 +
 .../kafka/trident/OpaqueTridentKafkaSpout.java  |   1 +
 .../trident/TransactionalTridentKafkaSpout.java |   1 +
 pom.xml                                         |   1 +
 13 files changed, 655 insertions(+)
----------------------------------------------------------------------