Github user HeartSaVioR commented on the pull request:
https://github.com/apache/storm/pull/286#issuecomment-61720636
OK, I've upmerged.
Btw, I found py files are diverged too so I need to copy and paste one file
to another.
---
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.
---
