Merge branch 'STORM-2340-merge'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/714ace23 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/714ace23 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/714ace23 Branch: refs/heads/master Commit: 714ace234711e44ca18f960d42a05ad2b39beee5 Parents: 3fd66b5 914a476 Author: Jungtaek Lim <[email protected]> Authored: Tue Feb 14 11:27:22 2017 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Tue Feb 14 11:27:22 2017 +0900 ---------------------------------------------------------------------- docs/storm-kafka-client.md | 22 ++++++++++ .../apache/storm/kafka/spout/KafkaSpout.java | 43 +++++++++++++------- 2 files changed, 50 insertions(+), 15 deletions(-) ----------------------------------------------------------------------
