Github user swill commented on the pull request:
https://github.com/apache/cloudstack/pull/1455#issuecomment-219539120
@sanju1010 we have merge conflicts now. Can you please rebase against the
current master. Code freeze is basically now, so if you want this in we need to
get busy...
---
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.
---
