Merge branch '1.x-branch' of https://github.com/Symantec/storm into STORM-1680-1.x
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e603cfef Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e603cfef Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e603cfef Branch: refs/heads/1.x-branch Commit: e603cfefbbe84d8b65debd7a98985d9481e5aead Parents: ac7b828 89f4d44 Author: Jungtaek Lim <[email protected]> Authored: Wed Apr 20 16:29:17 2016 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Wed Apr 20 16:29:17 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(-) ----------------------------------------------------------------------
