You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2013/11/27 11:31:52 UTC
[1/2] git commit: updated refs/heads/4.3 to 7f60024
Updated Branches:
refs/heads/4.3 8585e01ff -> 7f6002458
Fix VM stats collections in HyperV
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dff2825a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dff2825a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dff2825a
Branch: refs/heads/4.3
Commit: dff2825a97ffa73557c528e1e1403334517991af
Parents: 8585e01
Author: Rajesh Battala <ra...@citrix.com>
Authored: Wed Nov 27 16:03:14 2013 +0530
Committer: Rajesh Battala <ra...@citrix.com>
Committed: Wed Nov 27 16:03:14 2013 +0530
----------------------------------------------------------------------
.../ServerResource/HypervResource/HypervResourceController.cs | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dff2825a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
index f24ba80..fd6fe9f 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
@@ -1112,9 +1112,8 @@ namespace HypervResource
object ansContent = new
{
- vmInfos = vmProcessorInfo,
+ vmStatsMap = vmProcessorInfo,
result = result,
- details = details,
contextMap = contextMap
};
return ReturnCloudStackTypedJArray(ansContent, CloudStackTypes.GetVmStatsAnswer);
[2/2] git commit: updated refs/heads/4.3 to 7f60024
Posted by ra...@apache.org.
Added hv kvp daemon support for 64 bit systemvm template to support system vms to run on HyperV. hv_kvp daemon is used to pass the boot args from host to the guest.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7f600245
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7f600245
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7f600245
Branch: refs/heads/4.3
Commit: 7f6002458076f1049b75460475264bca669f243f
Parents: dff2825
Author: Rajesh Battala <ra...@citrix.com>
Authored: Wed Nov 27 16:05:21 2013 +0530
Committer: Rajesh Battala <ra...@citrix.com>
Committed: Wed Nov 27 16:05:21 2013 +0530
----------------------------------------------------------------------
tools/appliance/definitions/systemvm64template/postinstall.sh | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7f600245/tools/appliance/definitions/systemvm64template/postinstall.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvm64template/postinstall.sh b/tools/appliance/definitions/systemvm64template/postinstall.sh
index 3755b52..3232dc0 100644
--- a/tools/appliance/definitions/systemvm64template/postinstall.sh
+++ b/tools/appliance/definitions/systemvm64template/postinstall.sh
@@ -70,6 +70,11 @@ install_packages() {
echo "iptables-persistent iptables-persistent/autosave_v4 boolean true" | debconf-set-selections
echo "iptables-persistent iptables-persistent/autosave_v6 boolean true" | debconf-set-selections
apt-get --no-install-recommends -q -y --force-yes install iptables-persistent
+
+ # Hyperv kvp daemon
+ # Download the hv kvp daemon
+ wget http://people.apache.org/~rajeshbattala/hv-kvp-daemon_3.1_amd64.deb
+ dpkg -i hv-kvp-daemon_3.1_amd64.deb
# vmware tools
apt-get --no-install-recommends -q -y --force-yes install open-vm-tools