nvazquez commented on pull request #5848: URL: https://github.com/apache/cloudstack/pull/5848#issuecomment-1033980848
@DK101010 I verified there are some conflicts that needs to be fixed, please rebase the current main branch ```` INFO: Executing the merge now.. Git output below: INFO: *********************************************************************************** From https://github.com/apache/cloudstack * [new ref] refs/pull/5848/head -> pr/5848 Auto-merging vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java Auto-merging server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java Auto-merging server/src/main/java/com/cloud/api/query/dao/VolumeJoinDaoImpl.java Auto-merging plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java Auto-merging engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeObject.java Auto-merging engine/schema/src/main/resources/META-INF/db/schema-41610to41700.sql CONFLICT (add/add): 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 Auto-merging api/src/main/java/com/cloud/storage/Volume.java Automatic merge failed; fix conflicts and then commit the result. ERROR: Merge failed, aborting. Build step 'Execute shell' marked build as failure New run name is '#3540-5848' Stopping all containers Finished: FAILURE ```` -- 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]
