From 863a84a15dca7889692323e9e024fc8cedc1dc2b Mon Sep 17 00:00:00 2001
From: Prachi Damle <prachi@cloud.com>
Date: Fri, 25 Oct 2013 16:40:01 -0700
Subject: [PATCH] CLOUDSTACK-4948: DeploymentPlanner: Logic to check if cluster
 can be avoided, needs to consider if VM is using local storage and/or shared
 storage

Changes:
	- Changes due to VirtualMachineProfile changes done in master
---
 .../src/com/cloud/deploy/DeploymentPlanningManagerImpl.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
index f268957636f..0886840e435 100644
--- a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
+++ b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
@@ -916,7 +916,7 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy
     }
 
     private boolean canAvoidCluster(Cluster clusterVO, ExcludeList avoids, ExcludeList plannerAvoidOutput,
-            VirtualMachineProfile<? extends VirtualMachine> vmProfile) {
+            VirtualMachineProfile vmProfile) {
 
         ExcludeList allocatorAvoidOutput = new ExcludeList(avoids.getDataCentersToAvoid(), avoids.getPodsToAvoid(),
                 avoids.getClustersToAvoid(), avoids.getHostsToAvoid(), avoids.getPoolsToAvoid());
@@ -990,7 +990,7 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy
         return false;
     }
 
-    private Pair<Boolean, Boolean> findVMStorageRequirements(VirtualMachineProfile<? extends VirtualMachine> vmProfile) {
+    private Pair<Boolean, Boolean> findVMStorageRequirements(VirtualMachineProfile vmProfile) {
 
         boolean requiresShared = false, requiresLocal = false;