You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2014/01/17 06:31:38 UTC
[1/2] git commit: Fix lb reference not set issue at cluster monitor
Updated Branches:
refs/heads/master b654ee402 -> af0b54df7
Fix lb reference not set issue at cluster monitor
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/8299e03f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8299e03f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8299e03f
Branch: refs/heads/master
Commit: 8299e03f994aad40ce2a66c408b265b0c3396c38
Parents: 312baf7
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Fri Jan 17 11:05:26 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Fri Jan 17 11:05:26 2014 +0530
----------------------------------------------------------------------
.../java/org/apache/stratos/autoscaler/monitor/ClusterMonitor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8299e03f/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ClusterMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ClusterMonitor.java
index 37482ca..e76233b 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ClusterMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ClusterMonitor.java
@@ -106,7 +106,7 @@ public class ClusterMonitor extends AbstractMonitor{
scaleCheckKnowledgeSession.setGlobal("rifReset", rifReset);
scaleCheckKnowledgeSession.setGlobal("mcReset", memoryConsumptionReset);
scaleCheckKnowledgeSession.setGlobal("laReset", loadAverageReset);
- minCheckKnowledgeSession.setGlobal("lbRef", lbReferenceType);
+ scaleCheckKnowledgeSession.setGlobal("lbRef", lbReferenceType);
if (log.isDebugEnabled()) {
log.debug(String.format("Running scale check for network partition %s ", networkPartitionContext.getId()));
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by la...@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/af0b54df
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/af0b54df
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/af0b54df
Branch: refs/heads/master
Commit: af0b54df72c6de678e33be9909d22b77fb9f057c
Parents: 8299e03 b654ee4
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Fri Jan 17 11:05:35 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Fri Jan 17 11:05:35 2014 +0530
----------------------------------------------------------------------
.../console/console.iws | 176 +++++++++++--------
.../console/controllers/addTenantSubmit.jag | 9 +
.../controllers/partitionDefinitionSubmit.jag | 9 +
.../controllers/policyDefinitionSubmit.jag | 9 +
.../theme1/partials/partition_deployments.hbs | 6 +-
.../theme1/partials/policy_deployments.hbs | 6 +-
6 files changed, 136 insertions(+), 79 deletions(-)
----------------------------------------------------------------------