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/07/06 16:03:26 UTC

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

Merge branch 'STORM-3090' of https://github.com/choojoyq/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/83e5788c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/83e5788c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/83e5788c

Branch: refs/heads/1.x-branch
Commit: 83e5788c06863cbf4ad336dbfb142aa237b0cba0
Parents: 9938ed3 35797bf
Author: Stig Rohde Døssing <sr...@apache.org>
Authored: Fri Jul 6 17:42:20 2018 +0200
Committer: Stig Rohde Døssing <sr...@apache.org>
Committed: Fri Jul 6 17:42:20 2018 +0200

----------------------------------------------------------------------
 .../jvm/org/apache/storm/kafka/KafkaSpout.java  | 23 +++++++------
 .../apache/storm/kafka/PartitionManager.java    |  6 ++--
 .../org/apache/storm/kafka/ZkCoordinator.java   | 29 +++++++++-------
 .../test/org/apache/storm/kafka/TestUtils.java  | 14 ++++----
 .../apache/storm/kafka/ZkCoordinatorTest.java   | 36 ++++++++++++++++++++
 5 files changed, 75 insertions(+), 33 deletions(-)
----------------------------------------------------------------------