Github user swill commented on the pull request:
https://github.com/apache/cloudstack/pull/1365#issuecomment-216442130
@rhtyd thanks for fixing the merge conflicts. ð
@GabrielBrascher and @mike-tutkowski, I know you guys have spent some time
with this file, would you guys mind reviewing the approach that @rhtyd has
taken to resolve the merge conflict and make sure you guys are happy with it?
I will also do a CI run against master before I do any additional merges to
verify we are all good before we move on.
Thanks for the support on this guys...
---
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.
---
