Github user DaanHoogland commented on the pull request:
https://github.com/apache/cloudstack/pull/1297#issuecomment-219238801
@rhtyd @swill @NuxRo I resolved the conflict. Looks like we want to rerun
integration tests and maybe test the dynamic service offering bit???
---
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.
---
