You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2018/02/24 10:51:03 UTC
[2/2] storm git commit: Merge branch 'STORM-2952-1.0.x-merge' into
1.0.x-branch
Merge branch 'STORM-2952-1.0.x-merge' into 1.0.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/fd2089d4
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fd2089d4
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fd2089d4
Branch: refs/heads/1.0.x-branch
Commit: fd2089d4938a69b55d1d31a23ed676488df35ef1
Parents: 05120d3 1245fce
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sat Feb 24 19:50:55 2018 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Feb 24 19:50:55 2018 +0900
----------------------------------------------------------------------
external/storm-kafka/README.md | 3 +++
.../storm-kafka/src/jvm/org/apache/storm/kafka/KafkaSpout.java | 4 ++++
.../org/apache/storm/kafka/trident/OpaqueTridentKafkaSpout.java | 5 ++++-
.../storm/kafka/trident/TransactionalTridentKafkaSpout.java | 5 ++++-
.../jvm/org/apache/storm/kafka/trident/TridentKafkaState.java | 4 ++++
5 files changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------