Merge branch 'STORM-3013-1.x' of https://github.com/srdo/storm into 
STORM-3013-1.x-merge


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

Branch: refs/heads/1.x-branch
Commit: 3b5f9e7c75b378881060f454d39e6bf653e0bcb3
Parents: d5ead66 b7e19c7
Author: Jungtaek Lim <kabh...@gmail.com>
Authored: Fri Jul 13 11:15:41 2018 +0900
Committer: Jungtaek Lim <kabh...@gmail.com>
Committed: Fri Jul 13 11:15:41 2018 +0900

----------------------------------------------------------------------
 .../apache/storm/kafka/spout/KafkaSpout.java    | 43 +++++++---------
 .../kafka/spout/metrics/KafkaOffsetMetric.java  |  6 +--
 .../kafka/spout/KafkaSpoutAbstractTest.java     |  6 ++-
 .../kafka/spout/KafkaSpoutReactivationTest.java | 54 ++++++++++++++------
 .../kafka/spout/KafkaSpoutSingleTopicTest.java  |  2 +-
 ...outTopologyDeployActivateDeactivateTest.java |  2 -
 6 files changed, 66 insertions(+), 47 deletions(-)
----------------------------------------------------------------------


Reply via email to