Merge branch 'STORM-1756-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/619acfd0 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/619acfd0 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/619acfd0 Branch: refs/heads/1.x-branch Commit: 619acfd04a172c4654803cbb2fdc22038e23d774 Parents: 93637a3 e7b7a01 Author: Jungtaek Lim <[email protected]> Authored: Mon May 16 18:01:20 2016 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Mon May 16 18:01:20 2016 +0900 ---------------------------------------------------------------------- .../src/test/org/apache/storm/kafka/KafkaTestBroker.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
