Github user aledsage commented on the pull request:
https://github.com/apache/incubator-brooklyn/pull/805#issuecomment-129908584
@ygy this has merge conflicts please - can you resolve those, and then ping
me and I'll merge it. If I'm not available, then ping anyone else on IRC.
---
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.
---
