Merge branch 'STORM-2639-1.1.x' into 1.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/66401741
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/66401741
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/66401741

Branch: refs/heads/1.1.x-branch
Commit: 6640174174699b3823545c01be97be1ff2d02398
Parents: 1c3c1ec 04fe95e
Author: Jungtaek Lim <kabh...@gmail.com>
Authored: Wed Jul 19 14:16:26 2017 +0900
Committer: Jungtaek Lim <kabh...@gmail.com>
Committed: Wed Jul 19 14:16:26 2017 +0900

----------------------------------------------------------------------
 .../kafka/spout/internal/OffsetManager.java     |   9 +-
 .../storm/kafka/spout/KafkaSpoutCommitTest.java | 152 +++++++++++++++++++
 2 files changed, 157 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


Reply via email to