Github user lukess commented on the issue:
https://github.com/apache/storm/pull/1935
@HeartSaVioR I think the conflict because of merge so I reset last two
commits and rebase from last apache:master, and then squash. I think this
should be clean.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
