cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From weiz...@apache.org
Subject git commit: updated refs/heads/master to 0dd4551
Date Tue, 18 Jun 2013 15:00:54 GMT
Updated Branches:
  refs/heads/master 779763fdf -> 0dd45513e


CLOUDSTACK-2885: show cpuNumber and cpuSpeed on VM Statistics page


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

Branch: refs/heads/master
Commit: 0dd45513e307cd955dbf91b3fb4ebb8233dd685e
Parents: 779763f
Author: Wei Zhou <w.zhou@leaseweb.com>
Authored: Tue Jun 18 17:00:44 2013 +0200
Committer: Wei Zhou <w.zhou@leaseweb.com>
Committed: Tue Jun 18 17:00:44 2013 +0200

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0dd45513/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
index dbfe94d..305d2b2 100644
--- a/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
@@ -123,6 +123,8 @@ public class UserVmJoinDaoImpl extends GenericDaoBase<UserVmJoinVO,
Long> implem
         if (details.contains(VMDetails.all) || details.contains(VMDetails.servoff)) {
             userVmResponse.setServiceOfferingId(userVm.getServiceOfferingUuid());
             userVmResponse.setServiceOfferingName(userVm.getServiceOfferingName());
+        }
+        if (details.contains(VMDetails.all) || details.contains(VMDetails.servoff) || details.contains(VMDetails.stats))
{
             userVmResponse.setCpuNumber(userVm.getCpu());
             userVmResponse.setCpuSpeed(userVm.getSpeed());
             userVmResponse.setMemory(userVm.getRamSize());


Mime
View raw message