Github user DaanHoogland commented on the issue: https://github.com/apache/cloudstack/pull/2023 @karuturi I think it is easiest to just reapply and not search for the cause of an 8 month old PR resulting in conflicts. (if the original code has the right URLS in it)
--- 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. ---