Github user srdo commented on the issue:
https://github.com/apache/storm/pull/2181
@tiodollar Since there is still a conflict here, and we'd like this to go
in 1.1.2 which we hope to release before too long, I've resolved the conflicts
and addressed the review comments. There's a PR with the full set of changes
here https://github.com/apache/storm/pull/2367. Note that your commits are
still present, so you should still be credited with the fix.
Let me know if this is not okay with you.---
