From 48574f2d606ebddb358457301a3dbaa896e9595c Mon Sep 17 00:00:00 2001 From: Prachi Damle Date: Wed, 2 Jul 2014 17:24:29 -0700 Subject: [PATCH] CLOUDSTACK-7047: DeploymentPlanner should include disabled resources only when the VM owner is Admin account Changes: - removing unused imports --- server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java | 1 - server/src/com/cloud/deploy/FirstFitPlanner.java | 1 - 2 files changed, 2 deletions(-) diff --git a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java index d6f87b92599..bb94b76f7d6 100644 --- a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java +++ b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java @@ -120,7 +120,6 @@ import com.cloud.utils.db.TransactionStatus; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.fsm.StateListener; import com.cloud.vm.DiskProfile; -import com.cloud.vm.ReservationContext; import com.cloud.vm.VMInstanceVO; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachine.Event; diff --git a/server/src/com/cloud/deploy/FirstFitPlanner.java b/server/src/com/cloud/deploy/FirstFitPlanner.java index 859245644e7..48780a72ffd 100755 --- a/server/src/com/cloud/deploy/FirstFitPlanner.java +++ b/server/src/com/cloud/deploy/FirstFitPlanner.java @@ -56,7 +56,6 @@ import com.cloud.storage.dao.VolumeDao; import com.cloud.user.AccountManager; import com.cloud.utils.NumbersUtil; import com.cloud.utils.Pair; -import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.dao.UserVmDao;