Github user DaanHoogland commented on the pull request: https://github.com/apache/cloudstack/pull/1136#issuecomment-160418520 @bhaisaab you should not have merged #1119 as it is also in 4.6. This merge commit was wrong because of this isse and should have been fixed before merging. Now the same thing is doen in two different commits. the idea is that you always merge forward so you can always track the branches a change is in. Squashing??? we don't go back to the mess we were in are we?
--- 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. ---