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 2017/07/07 03:17:49 UTC
[2/3] storm git commit: Merge branch 'STORM-2506--1.x-branch' of
https://github.com/erikdw/storm into STORM-2506-1.x
Merge branch 'STORM-2506--1.x-branch' of https://github.com/erikdw/storm into STORM-2506-1.x
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c90d140b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c90d140b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c90d140b
Branch: refs/heads/1.x-branch
Commit: c90d140bed6f2b578e0a6cb130ab3546148ccb42
Parents: c66a916 2828400
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Jul 7 12:15:46 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Jul 7 12:15:46 2017 +0900
----------------------------------------------------------------------
.../apache/storm/kafka/spout/KafkaSpout.java | 4 ++--
.../jvm/org/apache/storm/kafka/KafkaSpout.java | 4 ++--
.../jvm/org/apache/storm/kafka/KafkaUtils.java | 17 +++++++++--------
.../apache/storm/kafka/StaticCoordinator.java | 4 ++--
.../org/apache/storm/kafka/ZkCoordinator.java | 20 +++++++++++---------
.../org/apache/storm/kafka/KafkaUtilsTest.java | 8 ++++----
.../apache/storm/kafka/ZkCoordinatorTest.java | 2 +-
7 files changed, 31 insertions(+), 28 deletions(-)
----------------------------------------------------------------------