cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From remibergsma <...@git.apache.org>
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:

    https://github.com/apache/cloudstack/pull/897#issuecomment-153008102
  
    This PR has a conflict now, can someone resolve it?
    
    ```
    From https://github.com/apache/cloudstack
     * [new ref]         refs/pull/987/head -> pr/987
    Auto-merging server/src/com/cloud/network/router/CommandSetupHelper.java
    Auto-merging plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
    Auto-merging engine/schema/src/com/cloud/network/dao/NetworkVO.java
    Auto-merging api/src/com/cloud/agent/api/to/LoadBalancerTO.java
    CONFLICT (content): Merge conflict in api/src/com/cloud/agent/api/to/LoadBalancerTO.java
    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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message