Merge branch 'STORM-2340-1.x-merge' 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/f90d17c9 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f90d17c9 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f90d17c9 Branch: refs/heads/1.x-branch Commit: f90d17c9715b6329938f2bd41442da5250a76bdc Parents: 2128fc3 f5a1cf0 Author: Jungtaek Lim <[email protected]> Authored: Tue Feb 14 11:53:49 2017 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Tue Feb 14 11:53:49 2017 +0900 ---------------------------------------------------------------------- docs/storm-kafka-client.md | 22 ++++++++++ .../apache/storm/kafka/spout/KafkaSpout.java | 43 +++++++++++++------- 2 files changed, 50 insertions(+), 15 deletions(-) ----------------------------------------------------------------------
