Github user remibergsma commented on the pull request:
https://github.com/apache/cloudstack/pull/935#issuecomment-148929405
@nvazquez Thanks for your reply. If you made this from 4.5.1, be aware that
you submitted it against current master so this will for sure cause problems.
That may be why Jenkins failed and you have all these conflicts.
Please make your patch against current master, as it is the only way to get
it in. Otherwise, it will would be in 4.5.x and not in any newer versions
causing regression when upgrading from 4.5 to 4.6 etc.
Master is currently frozen and almost stable as we're heading to a 4.6
release so developing against it works great.
You will also find the test in the master branch.
---
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.
---
