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:08 UTC

[2/2] storm git commit: Merge branch 'STORM-2952-1.1.x-merge' into 1.1.x-branch

Merge branch 'STORM-2952-1.1.x-merge' into 1.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/672d3fae
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/672d3fae
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/672d3fae

Branch: refs/heads/1.1.x-branch
Commit: 672d3fae91f67b6e3e49473566703d2f744efcbe
Parents: 31ca71a 7e15411
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sat Feb 24 19:50:19 2018 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Feb 24 19:50:19 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(-)
----------------------------------------------------------------------