Github user swill commented on the pull request: https://github.com/apache/cloudstack/pull/1365#issuecomment-216893135 Just as an update for everyone. CI ran against master with the merge conflict fix and everything went smoothly, so we are all set. Thanks for the help on this @rhtyd.
--- 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. ---