Merge branch 'STORM-2639-1.x' into 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/6cfcbeef Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6cfcbeef Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6cfcbeef Branch: refs/heads/1.x-branch Commit: 6cfcbeef4cd2da9f601687966aa08f6b75e41597 Parents: d54cb1a 3c12622 Author: Jungtaek Lim <kabh...@gmail.com> Authored: Wed Jul 19 14:10:00 2017 +0900 Committer: Jungtaek Lim <kabh...@gmail.com> Committed: Wed Jul 19 14:10:00 2017 +0900 ---------------------------------------------------------------------- .../kafka/spout/internal/OffsetManager.java | 9 +- .../storm/kafka/spout/KafkaSpoutCommitTest.java | 152 +++++++++++++++++++ 2 files changed, 157 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
