Github user ahgittin commented on the issue:
https://github.com/apache/brooklyn-server/pull/363
More goddamn merge conflicts. Any objections to commit-then-review on this
one?--- 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. ---
