apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix compile

Browse Source
This commit is contained in:
Edison Su 2013-06-20 00:57:06 -07:00
parent 97f8c524b8
commit 733ed3622d
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java
View File

@ -430,6 +430,11 @@ public class TemplateObject implements TemplateInfo {
return this.imageVO.getDetails();
}
@Override
public Boolean isDynamicallyScalable() {
return Boolean.FALSE;
}
@Override
public long getDomainId() {
return this.imageVO.getDomainId();

2
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
View File

@ -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);
Account.ACCOUNT_ID_SYSTEM, null, "xen-pv-drv-iso", false, 1, false, HypervisorType.XenServer, null, null, false, false);
_tmpltDao.persist(template);
} else {
id = tmplt.getId();

4
server/src/com/cloud/template/TemplateAdapterBase.java
View File

@ -106,11 +106,7 @@ public abstract class TemplateAdapterBase extends AdapterBase implements Templat
Boolean isExtractable, String format, Long guestOSId, Long zoneId, HypervisorType hypervisorType,
String accountName, Long domainId, String chksum, Boolean bootable, Map details) throws ResourceAllocationException {
return prepare(isIso, userId, name, displayText, bits, passwordEnabled, requiresHVM, url, isPublic, featured, isExtractable, format, guestOSId, zoneId, hypervisorType,
<<<<<<< HEAD
chksum, bootable, null, null, details, false, null, false);
=======
chksum, bootable, null, null, details, false);
>>>>>>> object_store
}
@Override