Github user ustcweizhou commented on the pull request:
https://github.com/apache/cloudstack/pull/1029#issuecomment-160467601
@remibergsma rebased with latest master.
There is a conflict with 4.6 because of commit
1a64c247adbeb326f7ddbe6e4feaf3159e9e740d
---
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.
---
