From 1b89a22ab09045782fb438dd141eb0e1df39b9bb Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Wed, 8 Feb 2023 16:52:35 +0100 Subject: [PATCH] fix merge conflicts of merge branch '4.17' --- .../test/java/com/cloud/vm/VirtualMachineManagerImplTest.java | 1 + server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java b/engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java index ff774d7e083..dd6f51d7577 100644 --- a/engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java +++ b/engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java @@ -63,6 +63,7 @@ import com.cloud.host.Host; import com.cloud.host.HostVO; import com.cloud.host.dao.HostDao; import com.cloud.hypervisor.Hypervisor.HypervisorType; +import com.cloud.offering.ServiceOffering; import com.cloud.service.ServiceOfferingVO; import com.cloud.service.dao.ServiceOfferingDao; import com.cloud.storage.DiskOfferingVO; diff --git a/server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java b/server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java index 77a8b3db9ae..18b4a891917 100644 --- a/server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java +++ b/server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java @@ -646,7 +646,6 @@ public class UserVmManagerImplTest { return newRootDiskOffering; } -<<<<<<< HEAD private ServiceOfferingVO prepareOfferingsForEncryptionValidation(long diskOfferingId, boolean encryption) { ServiceOfferingVO svcOffering = Mockito.mock(ServiceOfferingVO.class); DiskOfferingVO diskOffering = Mockito.mock(DiskOfferingVO.class);