You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ki...@apache.org on 2016/03/17 09:10:14 UTC
[2/2] git commit: updated refs/heads/master to dc0ba6b
Merge pull request #780 from maneesha-p/pull-19
CLOUDSTACK-8800 : Improved the listVirtualMachines API call to include memory utilization information for a VMfor xenserver,kvm and for vmware.
* pr/780:
CLOUDSTACK-8800 : Improved the listVirtualMachines API call to include memory utilization information for a VM for xenserver,kvm and for vmware.
Signed-off-by: Kishan Kavala <ki...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dc0ba6bd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dc0ba6bd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dc0ba6bd
Branch: refs/heads/master
Commit: dc0ba6bd1a774d3ff4bc4a4dcc00e1434ab1f6e3
Parents: 63f58dd 732a852
Author: Kishan Kavala <ki...@apache.org>
Authored: Thu Mar 17 12:35:48 2016 +0530
Committer: Kishan Kavala <ki...@apache.org>
Committed: Thu Mar 17 12:35:48 2016 +0530
----------------------------------------------------------------------
api/src/com/cloud/vm/VmStats.java | 6 ++++
.../cloudstack/api/response/UserVmResponse.java | 36 ++++++++++++++++++++
core/src/com/cloud/agent/api/VmStatsEntry.java | 35 ++++++++++++++++++-
.../kvm/resource/LibvirtComputingResource.java | 13 +++++++
.../resource/LibvirtComputingResourceTest.java | 11 +++++-
.../cloud/agent/manager/MockVmManagerImpl.java | 2 +-
.../vmware/resource/VmwareResource.java | 24 ++++++++++---
.../xenserver/resource/CitrixResourceBase.java | 12 +++++--
.../cloud/api/query/dao/UserVmJoinDaoImpl.java | 15 +++++---
server/src/com/cloud/server/StatsCollector.java | 7 ++++
10 files changed, 148 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dc0ba6bd/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dc0ba6bd/server/src/com/cloud/server/StatsCollector.java
----------------------------------------------------------------------