You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2013/11/26 15:02:52 UTC

[1/2] git commit: Set deployment policy file name

Updated Branches:
  refs/heads/master a7a6ef227 -> 8e89271cd


Set deployment policy file name


Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/0a9e186a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/0a9e186a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/0a9e186a

Branch: refs/heads/master
Commit: 0a9e186add3eb1f62549e957a548e2f1c7bb6860
Parents: ae1acf1
Author: Udara Liyanage <ud...@wso2.com>
Authored: Tue Nov 26 19:28:21 2013 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Tue Nov 26 19:28:21 2013 -0500

----------------------------------------------------------------------
 .../apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0a9e186a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java
index 8113083..538fb22 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java
@@ -72,7 +72,8 @@ public class AutoscalerRuleEvaluator {
 
             for (Cluster cluster: service.getClusters()){
                 //update cluster-context
-                AutoscalerUtil.updateClusterContext(cluster);
+            	cluster.setDeploymentPolicyName("economy-deployment");
+                AutoscalerUtil.updateClusterContext(cluster);                
             }
 
             ksession = kbase.newStatefulKnowledgeSession();


[2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos

Posted by ud...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos


Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/8e89271c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8e89271c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8e89271c

Branch: refs/heads/master
Commit: 8e89271cd9401673faebcf150338c2055b15fdef
Parents: 0a9e186 a7a6ef2
Author: Udara Liyanage <ud...@wso2.com>
Authored: Tue Nov 26 19:30:34 2013 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Tue Nov 26 19:30:34 2013 -0500

----------------------------------------------------------------------
 .../main/java/org/apache/stratos/autoscaler/ClusterContext.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------