Github user swill commented on the pull request:
https://github.com/apache/cloudstack/pull/1376#issuecomment-216889967
This PR currently has merge conflicts, but #1515 is next in line, so you
may want to wait till it is merged before you fix these conflicts.
---
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.
---
