You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pr...@apache.org on 2013/11/05 01:45:38 UTC
[2/3] git commit: updated refs/heads/master to 3cc8239
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
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/863a84a1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/863a84a1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/863a84a1
Branch: refs/heads/master
Commit: 863a84a15dca7889692323e9e024fc8cedc1dc2b
Parents: 4be7947
Author: Prachi Damle <pr...@cloud.com>
Authored: Fri Oct 25 16:40:01 2013 -0700
Committer: Prachi Damle <pr...@cloud.com>
Committed: Mon Nov 4 16:45:06 2013 -0800
----------------------------------------------------------------------
server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/863a84a1/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
index f268957..0886840 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;