cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From likit...@apache.org
Subject git commit: updated refs/heads/4.3 to aef392d
Date Thu, 28 Nov 2013 10:24:15 GMT
Updated Branches:
  refs/heads/4.3 4edc3989b -> aef392de9


CLOUDSTACK-5302. listHosts API response - value of cpuallocated is always 0%


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

Branch: refs/heads/4.3
Commit: aef392de99f5e5b9acd55f942604609c870db9bd
Parents: 4edc398
Author: Likitha Shetty <likitha.shetty@citrix.com>
Authored: Thu Nov 28 15:40:05 2013 +0530
Committer: Likitha Shetty <likitha.shetty@citrix.com>
Committed: Thu Nov 28 15:47:40 2013 +0530

----------------------------------------------------------------------
 server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aef392de/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java
index 6847543..be3bd12 100644
--- a/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java
@@ -113,7 +113,7 @@ public class HostJoinDaoImpl extends GenericDaoBase<HostJoinVO, Long>
implements
             if (details.contains(HostDetails.all) || details.contains(HostDetails.capacity))
{
                 // set allocated capacities
                 Long mem = host.getMemReservedCapacity() + host.getMemUsedCapacity();
-                Long cpu = host.getCpuReservedCapacity() + host.getCpuReservedCapacity();
+                Long cpu = host.getCpuReservedCapacity() + host.getCpuUsedCapacity();
 
                 hostResponse.setMemoryAllocated(mem);
                 hostResponse.setMemoryTotal(host.getTotalMemory());


Mime
View raw message