You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2013/09/16 11:11:29 UTC
[31/50] [abbrv] git commit: updated refs/heads/kvm-vnc-listen to
895c51d
Revert "CLOUDSTACK-4649"
This reverts commit c82ef422b47fe2909ff79b7f91d2ba76bf007457.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1f421536
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1f421536
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1f421536
Branch: refs/heads/kvm-vnc-listen
Commit: 1f42153630ca332b367b069f77ee01bcd2395803
Parents: 1510139
Author: Anthony Xu <an...@citrix.com>
Authored: Thu Sep 12 13:00:32 2013 -0700
Committer: Anthony Xu <an...@citrix.com>
Committed: Thu Sep 12 13:00:42 2013 -0700
----------------------------------------------------------------------
.../com/cloud/hypervisor/xen/resource/XenServer56FP1Resource.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1f421536/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56FP1Resource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56FP1Resource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56FP1Resource.java
index b22910a..214dbd4 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56FP1Resource.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56FP1Resource.java
@@ -160,7 +160,6 @@ public class XenServer56FP1Resource extends XenServer56Resource {
VM template = templates.iterator().next();
VM.Record vmr = template.getRecord(conn);
- vmr.platform.remove("device_id");
vmr.affinity = host;
vmr.otherConfig.remove("disks");
vmr.otherConfig.remove("default_template");