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/06/21 23:51:37 UTC
[2/3] storm git commit: Merge branch 'DATA-3766' of
https://github.com/srishtyagrawal/storm into STORM-2506-merge
Merge branch 'DATA-3766' of https://github.com/srishtyagrawal/storm into STORM-2506-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9a20c67e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9a20c67e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9a20c67e
Branch: refs/heads/master
Commit: 9a20c67e63cef8cbfe024aa38b336c8a21dc0103
Parents: 34a7f6f 3ab11ea
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Jun 22 08:49:47 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Jun 22 08:49:47 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 | 5 +++--
.../org/apache/storm/kafka/ZkCoordinator.java | 22 ++++++++++++--------
.../org/apache/storm/kafka/KafkaUtilsTest.java | 8 +++----
.../apache/storm/kafka/ZkCoordinatorTest.java | 2 +-
.../src/jvm/org/apache/storm/daemon/Task.java | 2 +-
8 files changed, 35 insertions(+), 29 deletions(-)
----------------------------------------------------------------------