Github user karuturi commented on the issue:
https://github.com/apache/cloudstack/pull/1697
@nathanejohnson @kiwiflyer There were some conflicts while merging to
master. I went ahead and resolved as they are minor conflicts. Please verify
that everything is fine on master.
---
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.
---
