cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raj...@apache.org
Subject [24/50] [abbrv] git commit: updated refs/heads/master to 4c5f792
Date Wed, 05 Nov 2014 10:45:18 GMT
CLOUDSTACK-7820: Don't consider disabled hosts for calculating disable threshold.


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

Branch: refs/heads/master
Commit: c30d4ed1c27303aa20b2aa891a58aae906dc9ab0
Parents: 6df0b9f
Author: Nitin Mehta <nitin.mehta@citrix.com>
Authored: Thu Oct 30 16:54:00 2014 -0700
Committer: Nitin Mehta <nitin.mehta@citrix.com>
Committed: Thu Oct 30 16:54:00 2014 -0700

----------------------------------------------------------------------
 engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c30d4ed1/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java b/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
index 9cae045..cea18bd 100755
--- a/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
+++ b/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
@@ -177,7 +177,7 @@ public class CapacityDaoImpl extends GenericDaoBase<CapacityVO, Long>
implements
         "ELSE (SELECT config.value FROM `cloud`.`configuration` config WHERE config.name
= ?) " +
         "END configValue " +
         "FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`cluster_details` overcommit
ON overcommit.cluster_id = capacity.cluster_id " +
-        "WHERE capacity.data_center_id = ? AND capacity.capacity_type = ? AND capacity.total_capacity
> 0 AND overcommit.name = ?) cluster " +
+        "WHERE capacity.data_center_id = ? AND capacity.capacity_type = ? AND capacity.total_capacity
> 0 AND overcommit.name = ? AND capacity.capacity_state='Enabled') cluster " +
 
         "GROUP BY cluster.cluster_id)  clusterList " +
         "WHERE clusterList.ratio > clusterList.value; ";


Mime
View raw message