Github user HeartSaVioR commented on the issue:
https://github.com/apache/storm/pull/2242
@Ethanlm
Sorry there's merge conflict now. Could you resolve this?
You may want to just regenerate classes from thrift since the conflict
occurs from generated files.
---
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.
---
