mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
Conflicts: engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java engine/schema/src/com/cloud/upgrade/dao/Upgrade420to421.java plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java