Github user revans2 commented on the pull request:
https://github.com/apache/storm/pull/1185#issuecomment-193442125
Please upmerge the metrics code has been moved to
StormMetricsRegistry.java, and is causing conflicts now.
---
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.
---