cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [5/7] git commit: updated refs/heads/ui-template-uploader to 6d9542f
Date Tue, 06 Jan 2015 19:25:46 GMT
CID-1114613 dead code removed


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/682c3af7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/682c3af7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/682c3af7

Branch: refs/heads/ui-template-uploader
Commit: 682c3af710ef002d49153f6e8b9db273378ab78d
Parents: e8a54f4
Author: Daan Hoogland <daan@onecht.net>
Authored: Tue Jan 6 16:38:41 2015 +0100
Committer: Daan Hoogland <daan@onecht.net>
Committed: Tue Jan 6 16:38:41 2015 +0100

----------------------------------------------------------------------
 .../src/com/cloud/deploy/ImplicitDedicationPlanner.java            | 2 --
 1 file changed, 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/682c3af7/plugins/deployment-planners/implicit-dedication/src/com/cloud/deploy/ImplicitDedicationPlanner.java
----------------------------------------------------------------------
diff --git a/plugins/deployment-planners/implicit-dedication/src/com/cloud/deploy/ImplicitDedicationPlanner.java
b/plugins/deployment-planners/implicit-dedication/src/com/cloud/deploy/ImplicitDedicationPlanner.java
index bc3ff0a..9500cac 100644
--- a/plugins/deployment-planners/implicit-dedication/src/com/cloud/deploy/ImplicitDedicationPlanner.java
+++ b/plugins/deployment-planners/implicit-dedication/src/com/cloud/deploy/ImplicitDedicationPlanner.java
@@ -308,8 +308,6 @@ public class ImplicitDedicationPlanner extends FirstFitPlanner implements
Deploy
                 // But the host where system vms are running is marked as shared and still
be part of empty Hosts.
                 // The scenario will fail where actual Empty hosts and uservms not running
host.
                 return PlannerResourceUsage.Dedicated;
-            } else if (!preferred) {
-                return PlannerResourceUsage.Dedicated;
             } else {
                 if (!allOtherHosts.isEmpty() && (hostsToAvoid == null || !hostsToAvoid.containsAll(allOtherHosts)))
{
                     return PlannerResourceUsage.Shared;


Mime
View raw message