Updated Branches: refs/heads/4.2 f52533c81 -> fdd33fbb1
Revert "CLOUDSTACK-4649" This reverts commit 5950d37e9f57a41a945a11724f250aaeffa9b118. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fdd33fbb Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fdd33fbb Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fdd33fbb Branch: refs/heads/4.2 Commit: fdd33fbb174b3279ab8ab6cde30e6185ac8da7e2 Parents: f52533c Author: Anthony Xu <[email protected]> Authored: Thu Oct 17 11:26:11 2013 -0700 Committer: Anthony Xu <[email protected]> Committed: Thu Oct 17 11:26:11 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/fdd33fbb/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");
