Github user remibergsma commented on the pull request: https://github.com/apache/cloudstack/pull/1052#issuecomment-155204620 @davidamorimfaria Ooops... something went wrong! You got like 10 commits of other people pushed and created conflicts. I'd suggest squashing your own commits and making sure it's the only commit in the pr.
--- 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. ---