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/09 21:17:09 UTC

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

Merge branch 'STORM-3090' of https://github.com/choojoyq/storm into asfgit-1.1.x


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

Branch: refs/heads/1.1.x-branch
Commit: 824bd4816a4c22de907e5a268d73f8cb566ed499
Parents: 63aedca 98bc643
Author: Stig Rohde Døssing <sr...@apache.org>
Authored: Mon Jul 9 23:15:51 2018 +0200
Committer: Stig Rohde Døssing <sr...@apache.org>
Committed: Mon Jul 9 23:15:51 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(-)
----------------------------------------------------------------------