Github user remibergsma commented on the pull request:
https://github.com/apache/cloudstack/pull/886#issuecomment-158676481
@borisroman Can you have a look and resolve the conflict? When we find
another reviewer we can merge this in 4.7. Pinging @DaanHoogland @bhaisaab
---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
