Github user swill commented on the pull request: https://github.com/apache/cloudstack/pull/1374#issuecomment-216347252 @milamberspace I think that is probably the best option. Then I will merge the new one (with these changes) first and forward merge and then merge #1515 and then if no conflicts #1376.
--- 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. ---