Github user swill commented on the pull request:
https://github.com/apache/cloudstack/pull/1489#issuecomment-218356331
Sorry to do this to you @rhtyd, but I just merged like 10 PRs and we now
have merge conflicts. Can you resolve the merge conflicts and re-push. When
you resolve the merge conflicts, would you mind not squashing the fixes to the
merge conflicts so we can more easily review the changes required to resolve
the merge conflicts. This will help me know if I need to re-run CI before I
merge this. Thanks...
---
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.
---
