Merge branch 'STORM-1680'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c8457812 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c8457812 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c8457812 Branch: refs/heads/master Commit: c8457812805b658d895445ce58d2583d1cdfaa59 Parents: d593918 8b0af50 Author: Jungtaek Lim <[email protected]> Authored: Wed Apr 20 16:31:10 2016 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Wed Apr 20 16:31:10 2016 +0900 ---------------------------------------------------------------------- .../storm-kafka/src/jvm/org/apache/storm/kafka/KafkaConfig.java | 5 ++++- .../storm-kafka/src/jvm/org/apache/storm/kafka/KafkaUtils.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
