cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject [8/9] git commit: updated refs/heads/master to ccfe557
Date Tue, 10 Dec 2013 04:52:15 GMT
fix bean error


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

Branch: refs/heads/master
Commit: d910b423396ceee49c429d7dc770057aa59d66c7
Parents: 5e23f00
Author: tuna <ng.tuna@gmail.com>
Authored: Tue Dec 10 11:30:55 2013 +0700
Committer: tuna <ng.tuna@gmail.com>
Committed: Tue Dec 10 11:30:55 2013 +0700

----------------------------------------------------------------------
 .../cloudstack/core/spring-engine-schema-core-daos-context.xml | 1 +
 server/src/com/cloud/network/as/AutoScaleManagerImpl.java      | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d910b423/engine/schema/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
----------------------------------------------------------------------
diff --git a/engine/schema/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
b/engine/schema/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
index 4f7d7ea..e7caa20 100644
--- a/engine/schema/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
+++ b/engine/schema/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
@@ -124,6 +124,7 @@
   <bean id="autoScalePolicyDaoImpl" class="com.cloud.network.as.dao.AutoScalePolicyDaoImpl"
/>
   <bean id="autoScaleVmGroupDaoImpl" class="com.cloud.network.as.dao.AutoScaleVmGroupDaoImpl"
/>
   <bean id="autoScaleVmGroupPolicyMapDaoImpl" class="com.cloud.network.as.dao.AutoScaleVmGroupPolicyMapDaoImpl"
/>
+  <bean id="autoScaleVmGroupVmMapDaoImpl" class="com.cloud.network.as.dao.AutoScaleVmGroupVmMapDaoImpl"
/>
   <bean id="autoScaleVmProfileDaoImpl" class="com.cloud.network.as.dao.AutoScaleVmProfileDaoImpl"
/>
   <bean id="capacityDaoImpl" class="com.cloud.capacity.dao.CapacityDaoImpl" />
   <bean id="certificateDaoImpl" class="com.cloud.certificate.dao.CertificateDaoImpl" />

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d910b423/server/src/com/cloud/network/as/AutoScaleManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java
index 5af37eb..fd415b1 100644
--- a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java
+++ b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java
@@ -1261,15 +1261,15 @@ public class AutoScaleManagerImpl<Type> extends ManagerBase
implements AutoScale
 			IpAddresses addrs = new IpAddresses(null, null);
 			if (zone.getNetworkType() == NetworkType.Basic) {
                 vm = _userVmService.createBasicSecurityGroupVirtualMachine(zone, serviceOffering,
template, null, owner, "autoScaleVm-" + asGroup.getId() + "-" + getCurrentTimeStampString(),
-                		"autoScaleVm-" + asGroup.getId() + "-" + getCurrentTimeStampString(), null,
null, null, HypervisorType.XenServer, HTTPMethod.GET, null, null, null, null, true, null,
null);
+                		"autoScaleVm-" + asGroup.getId() + "-" + getCurrentTimeStampString(), null,
null, null, HypervisorType.XenServer, HTTPMethod.GET, null, null, null, null, true, null,
null, null, null);
             } else {
                 if (zone.isSecurityGroupEnabled())  {
                     vm = _userVmService.createAdvancedSecurityGroupVirtualMachine(zone, serviceOffering,
template, null, null,
-                            owner, "autoScaleVm-" + asGroup.getId() + "-" + getCurrentTimeStampString(),
"autoScaleVm-" + asGroup.getId() + "-" + getCurrentTimeStampString(), null, null, null, HypervisorType.XenServer,
HTTPMethod.GET, null, null, null, null, true, null, null);
+                            owner, "autoScaleVm-" + asGroup.getId() + "-" + getCurrentTimeStampString(),
"autoScaleVm-" + asGroup.getId() + "-" + getCurrentTimeStampString(), null, null, null, HypervisorType.XenServer,
HTTPMethod.GET, null, null, null, null, true, null, null, null, null);
 
                 } else {
                     vm = _userVmService.createAdvancedVirtualMachine(zone, serviceOffering,
template, null, owner, "autoScaleVm-" + asGroup.getId() + "-" + getCurrentTimeStampString(),
"autoScaleVm-" + asGroup.getId() + "-" + getCurrentTimeStampString(),
-                            null, null, null, HypervisorType.XenServer, HTTPMethod.GET, null,
null, null, addrs, true, null, null);
+                            null, null, null, HypervisorType.XenServer, HTTPMethod.GET, null,
null, null, addrs, true, null, null, null, null);
 
                 }
             }


Mime
View raw message