From ad7ca02723734fe54f46042c1504303f7b8dfbb6 Mon Sep 17 00:00:00 2001 From: Fabricio Duarte Date: Mon, 24 Feb 2025 14:16:31 -0300 Subject: [PATCH] Fix merge errors --- .../java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java | 1 + 1 file changed, 1 insertion(+) diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java index bda17e0878c..b87ca4cb7be 100644 --- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java +++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java @@ -44,6 +44,7 @@ import java.util.stream.Collectors; import com.cloud.storage.Storage; import com.cloud.utils.exception.CloudRuntimeException; +import com.vmware.vim25.VirtualController; import org.apache.cloudstack.storage.DiskControllerMappingVO; import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils; import org.apache.commons.collections.CollectionUtils;