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 2015/11/26 00:31:00 UTC
[2/3] storm git commit: Merge branch 'STORM-1352' of
https://github.com/haohui/storm into STORM-1352
Merge branch 'STORM-1352' of https://github.com/haohui/storm into STORM-1352
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6d3bee9a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6d3bee9a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6d3bee9a
Branch: refs/heads/master
Commit: 6d3bee9a69db23ea68ca59259f7139d165dee391
Parents: 01bab86 c1c5273
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Wed Nov 25 14:35:16 2015 -0800
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Wed Nov 25 14:35:16 2015 -0800
----------------------------------------------------------------------
.../starter/trident/TridentKafkaWordCount.java | 15 ++++----
external/storm-kafka/README.md | 37 ++++++++++----------
.../src/jvm/storm/kafka/bolt/KafkaBolt.java | 13 ++-----
.../storm/kafka/trident/TridentKafkaState.java | 10 ++----
.../kafka/trident/TridentKafkaStateFactory.java | 10 ++++--
.../src/test/storm/kafka/TestUtils.java | 8 ++---
.../src/test/storm/kafka/TridentKafkaTest.java | 13 +++----
.../test/storm/kafka/TridentKafkaTopology.java | 33 +++++++----------
.../test/storm/kafka/bolt/KafkaBoltTest.java | 6 ++--
9 files changed, 58 insertions(+), 87 deletions(-)
----------------------------------------------------------------------