cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anthon...@apache.org
Subject git commit: updated refs/heads/4.2-forward to 5950d37
Date Thu, 12 Sep 2013 00:18:00 GMT
Updated Branches:
  refs/heads/4.2-forward 47c06e825 -> 5950d37e9


CLOUDSTACK-4649
       use the same virtual hardware platform in XS 6.2 as that in XS 6.0.2


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

Branch: refs/heads/4.2-forward
Commit: 5950d37e9f57a41a945a11724f250aaeffa9b118
Parents: 47c06e8
Author: Anthony Xu <anthony.xu@citrix.com>
Authored: Wed Sep 11 17:16:25 2013 -0700
Committer: Anthony Xu <anthony.xu@citrix.com>
Committed: Wed Sep 11 17:16:25 2013 -0700

----------------------------------------------------------------------
 .../com/cloud/hypervisor/xen/resource/XenServer56FP1Resource.java   | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5950d37e/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 214dbd4..b22910a 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,6 +160,7 @@ 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");


Mime
View raw message