Github user nathanejohnson commented on the issue:
https://github.com/apache/cloudstack/pull/1697
@karuturi do you happen to remember which files conflicted? I seem to
remember
VolumeOrchestrator.java having some changes in master that weren't in 4.9.
I've looked over all of the files that were touched in this PR and it all looks
good to me. Thanks for merging this!
---
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.
---
