Github user DaanHoogland commented on the pull request:
https://github.com/apache/cloudstack/pull/943#issuecomment-160704405
there is a merge conflict @rodrigo93 . can you resolve it 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.
---
