Github user ProjectMoon commented on the issue:
https://github.com/apache/cloudstack/pull/1617
We are in the process of fixing the conflicts. The rebase worked fine, but
we have to rewrite one of the new unit tests to not use the `UsageEventEmitter`.
---
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.
---
