Merge branch 'STORM-1756-1.0.x' into 1.0.x-branch

Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7ee9f1e1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7ee9f1e1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7ee9f1e1

Branch: refs/heads/1.0.x-branch
Commit: 7ee9f1e1c0d93f727744ac1bf0a25888bd13f0cd
Parents: 52875c2 1e873f7
Author: Jungtaek Lim <[email protected]>
Authored: Mon May 16 18:02:07 2016 +0900
Committer: Jungtaek Lim <[email protected]>
Committed: Mon May 16 18:02:07 2016 +0900

----------------------------------------------------------------------
 .../src/test/org/apache/storm/kafka/KafkaTestBroker.java      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


Reply via email to