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: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
