You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ni...@apache.org on 2014/06/18 01:59:40 UTC

git commit: updated refs/heads/4.4-forward to 6fca4eb

Repository: cloudstack
Updated Branches:
  refs/heads/4.4-forward 8ca8a7217 -> 6fca4eb0f


CLOUDSTACK-6929: HAPlanner (SkipHeuresticsPlanner) gets added into the list of regular planners currently, add it in the exclude list. Also create allocator order list


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

Branch: refs/heads/4.4-forward
Commit: 6fca4eb0f1193b4612d1057784d24d7db1d7b048
Parents: 8ca8a72
Author: Nitin Mehta <ni...@citrix.com>
Authored: Tue Jun 17 16:59:30 2014 -0700
Committer: Nitin Mehta <ni...@citrix.com>
Committed: Tue Jun 17 16:59:30 2014 -0700

----------------------------------------------------------------------
 .../cloudstack/core/spring-core-registry-core-context.xml         | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6fca4eb0/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml b/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
index d54823a..819fb83 100644
--- a/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
+++ b/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
@@ -75,6 +75,7 @@
         <property name="orderConfigDefault"
             value="FirstFitPlanner,UserDispersingPlanner,UserConcentratedPodPlanner,ImplicitDedicationPlanner,BareMetalPlanner" />
         <property name="excludeKey" value="deployment.planners.exclude" />
+	<property name="excludeDefault" value="SkipHeuresticsPlanner" />
     </bean>
 
     <bean id="haPlannersRegistry"
@@ -89,6 +90,8 @@
 
     <bean id="hostAllocatorsRegistry"
         class="org.apache.cloudstack.spring.lifecycle.registry.ExtensionRegistry">
+	<property name="orderConfigKey" value="host.allocators.order" />
+        <property name="orderConfigDefault" value="FirstFitRouting" />
         <property name="excludeKey" value="host.allocators.exclude" />
         <property name="excludeDefault"
             value="RandomAllocator,TestingAllocator,FirstFitAllocator,RecreateHostAllocator" />