cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From remibergsma <>
Subject [GitHub] cloudstack pull request: CLOUDSTACK-8919: Slow UI response while l...
Date Mon, 02 Nov 2015 12:47:47 GMT
Github user remibergsma commented on the pull request:
    This PR has a conflict now, can someone resolve it?
     * [new ref]         refs/pull/987/head -> pr/987
    Auto-merging server/src/com/cloud/network/router/
    Auto-merging plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/
    Auto-merging engine/schema/src/com/cloud/network/dao/
    Auto-merging api/src/com/cloud/agent/api/to/
    CONFLICT (content): Merge conflict in api/src/com/cloud/agent/api/to/
    Automatic merge failed; fix conflicts and then commit the result.
    ERROR: Merge failed, aborting.

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 or file a JIRA ticket
with INFRA.

View raw message