Github user nitin-maharana commented on the pull request:
https://github.com/apache/cloudstack/pull/897#issuecomment-153093925
Hi @remibergsma, I tried rebasing with current master. There is no conflict
as such.
I think you were trying to merge the PR #987, But this PR is #897.
And from the log I can see the conflicts are related to PR #987.
---
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.
---
