You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cloudstack.apache.org by GitBox <gi...@apache.org> on 2022/04/06 02:13:23 UTC

[GitHub] [cloudstack] nvazquez commented on pull request #5848: Feat/add vdisk UUID to list volume

nvazquez commented on PR #5848:
URL: https://github.com/apache/cloudstack/pull/5848#issuecomment-1089671830

   Hi @DK101010 the packaging is failing due to the merge conflicts
   ````
   Auto-merging vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
   Auto-merging server/src/main/java/com/cloud/api/query/vo/VolumeJoinVO.java
   Auto-merging engine/schema/src/main/resources/META-INF/db/schema-41610to41700.sql
   CONFLICT (content): Merge conflict in engine/schema/src/main/resources/META-INF/db/schema-41610to41700.sql
   Auto-merging api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
   Automatic merge failed; fix conflicts and then commit the result.
   ERROR: Merge failed, aborting.
   ````


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org