Github user aledsage commented on the pull request:
https://github.com/apache/incubator-brooklyn/pull/805#issuecomment-130065368
@ygy still merge conflicts - not sure if you fixed them in your recent
commit, but then other merged PRs have introduced conflicts again! Could you
rebase against master again please.
---
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.
---
