cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject git commit: updated refs/heads/master to 733ed36
Date Thu, 20 Jun 2013 07:57:41 GMT
Updated Branches:
  refs/heads/master 97f8c524b -> 733ed3622


fix compile


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

Branch: refs/heads/master
Commit: 733ed3622d79ee9c64cd5328ca3dea74500433b4
Parents: 97f8c52
Author: Edison Su <edison.su@citrix.com>
Authored: Thu Jun 20 00:57:06 2013 -0700
Committer: Edison Su <edison.su@citrix.com>
Committed: Thu Jun 20 00:57:06 2013 -0700

----------------------------------------------------------------------
 .../apache/cloudstack/storage/image/store/TemplateObject.java   | 5 +++++
 .../cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java    | 2 +-
 server/src/com/cloud/template/TemplateAdapterBase.java          | 4 ----
 3 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/733ed362/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java
----------------------------------------------------------------------
diff --git a/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java
b/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java
index 74a7d43..b093cbd 100644
--- a/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java
+++ b/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java
@@ -431,6 +431,11 @@ public class TemplateObject implements TemplateInfo {
     }
 
     @Override
+    public Boolean isDynamicallyScalable() {
+        return Boolean.FALSE;
+    }
+
+    @Override
     public long getDomainId() {
         return this.imageVO.getDomainId();
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/733ed362/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 e360c98..bc86be5 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);
+                    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();

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/733ed362/server/src/com/cloud/template/TemplateAdapterBase.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/template/TemplateAdapterBase.java b/server/src/com/cloud/template/TemplateAdapterBase.java
index 898ed24..c1f0604 100755
--- a/server/src/com/cloud/template/TemplateAdapterBase.java
+++ b/server/src/com/cloud/template/TemplateAdapterBase.java
@@ -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


Mime
View raw message