Github user DaanHoogland commented on the pull request:
https://github.com/apache/cloudstack/pull/1216#issuecomment-164387475
@maneesha-p @remibergsma had a go at it just before the creation of the RC
yesterday nigt but he encountered merge conflicts. Can you have e look? merge
with
```$ git pr 1216``` to see what the conflicts are. for this you need to
have ```git-pr``` in ```tools/git``` in your ```PATH```. alternatively you can
just try to checkout ```master``` and ```$ git merge <your 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.
---
