Github user remibergsma commented on the pull request:
https://github.com/apache/cloudstack/pull/883#issuecomment-153051565
Hi @SudharmaJain can you please fix the conflict? I'll then run some tests
and we're ready to merge.
---
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.
---
