Github user DaanHoogland commented on the pull request:
https://github.com/apache/cloudstack/pull/1453#issuecomment-207466536
@rafaelweingartner the merge errors occured during testing as merging is
part of the integration tests. I agree with @swill about the test being needed
for this change. thought I think it makes no sense/adds no value for some other
changes. The latter being UI and added tests. Every thing else should undergo
the regression suite.
---
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.
---
