Github user rhtyd commented on the issue:
https://github.com/apache/cloudstack/pull/1832
@karuturi please squash your changes and fix the merge conflict. We've
merged very large changes that were squash to a single commit, it becomes
easier to then cherry-pick them or revert them.
---
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.
---
