Github user swill commented on the pull request:
https://github.com/apache/cloudstack/pull/1365#issuecomment-216433479
Obviously this merge conflict exists because something has been refactored
in master which was not merged into previous versions. We need to understand
what was done and how to make sure both functionality can exist together... I
had to run to catch a train when I ran into this, so I have not gotten too deep
into which PR was merged into master which is conflicting with this.
---
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.
---
