You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2013/06/20 20:35:22 UTC
git commit: updated refs/heads/master to 205722a
Updated Branches:
refs/heads/master 207202634 -> 205722aab
fix nonoss build
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/205722aa
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/205722aa
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/205722aa
Branch: refs/heads/master
Commit: 205722aabfdf923fb73b1c34c08afc44be56417d
Parents: 2072026
Author: Edison Su <su...@gmail.com>
Authored: Thu Jun 20 10:46:49 2013 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Thu Jun 20 10:47:19 2013 -0700
----------------------------------------------------------------------
engine/schema/src/com/cloud/storage/VMTemplateVO.java | 5 +----
.../cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java | 2 +-
2 files changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/205722aa/engine/schema/src/com/cloud/storage/VMTemplateVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/storage/VMTemplateVO.java b/engine/schema/src/com/cloud/storage/VMTemplateVO.java
index 45eed23..3e71191 100755
--- a/engine/schema/src/com/cloud/storage/VMTemplateVO.java
+++ b/engine/schema/src/com/cloud/storage/VMTemplateVO.java
@@ -187,12 +187,9 @@ public class VMTemplateVO implements VirtualMachineTemplate {
public static VMTemplateVO createPreHostIso(Long id, String uniqueName, String name, ImageFormat format,
boolean isPublic, boolean featured, TemplateType type, String url, Date created, boolean requiresHvm,
int bits, long accountId, String cksum, String displayText, boolean enablePassword, long guestOSId,
- boolean bootable, HypervisorType hyperType, String templateTag, Map details, boolean sshKeyEnabled, boolean isDynamicallyScalable) {
+ boolean bootable, HypervisorType hyperType) {
VMTemplateVO template = new VMTemplateVO(id, uniqueName, name, format, isPublic, featured, type, url, created,
requiresHvm, bits, accountId, cksum, displayText, enablePassword, guestOSId, bootable, hyperType);
- template.templateTag = templateTag;
- template.enableSshKey = sshKeyEnabled;
- template.dynamicallyScalable = isDynamicallyScalable;
return template;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/205722aa/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
index bc86be5..e360c98 100755
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
@@ -549,7 +549,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L
id = _tmpltDao.getNextInSequence(Long.class, "id");
VMTemplateVO template = VMTemplateVO.createPreHostIso(id, isoName, isoName, ImageFormat.ISO, true, true,
TemplateType.PERHOST, null, null, true, 64,
- Account.ACCOUNT_ID_SYSTEM, null, "xen-pv-drv-iso", false, 1, false, HypervisorType.XenServer, null, null, false, false);
+ Account.ACCOUNT_ID_SYSTEM, null, "xen-pv-drv-iso", false, 1, false, HypervisorType.XenServer);
_tmpltDao.persist(template);
} else {
id = tmplt.getId();