You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2013/12/12 18:39:09 UTC

[1/2] git commit: Fixed cluster creation in load balancer static configuration

Updated Branches:
  refs/heads/master ab50491e5 -> fc51f7781


Fixed cluster creation in load balancer static configuration


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

Branch: refs/heads/master
Commit: 96db92cae5275c54492c5f17a2f5a3bc4ce20b7a
Parents: 0c9a2b8
Author: Imesh Gunaratne <im...@apache.org>
Authored: Thu Dec 12 23:08:47 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Dec 12 23:08:47 2013 +0530

----------------------------------------------------------------------
 .../stratos/load/balancer/conf/LoadBalancerConfiguration.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/96db92ca/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java
index cc2ede7..3827c81 100644
--- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java
+++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java
@@ -398,7 +398,7 @@ public class LoadBalancerConfiguration {
 
                     for (Node clusterNode : clustersNode.getChildNodes()) {
                         String clusterId = clusterNode.getName();
-                        Cluster cluster = new Cluster(service.getServiceName(), clusterId, null);
+                        Cluster cluster = new Cluster(service.getServiceName(), clusterId, null, null);
 
                         String tenantRange = clusterNode.getProperty(Constants.CONF_PROPERTY_TENANT_RANGE);
                         if (StringUtils.isNotBlank(tenantRange)) {

[2/2] git commit: Merge remote-tracking branch 'origin/master'

Posted by im...@apache.org.
Merge remote-tracking branch 'origin/master'


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

Branch: refs/heads/master
Commit: fc51f77812a3387f1cfbc45e21b037de95f2069c
Parents: 96db92c ab50491
Author: Imesh Gunaratne <im...@apache.org>
Authored: Thu Dec 12 23:09:02 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Dec 12 23:09:02 2013 +0530

----------------------------------------------------------------------
 .../health/stat/AverageLoadAverageEvent.java    | 58 +++++++++++++++++
 .../stat/AverageMemoryConsumptionEvent.java     | 58 +++++++++++++++++
 .../stat/AverageRequestsInFlightEvent.java      | 58 +++++++++++++++++
 .../health/stat/GradientOfLoadAverageEvent.java | 58 +++++++++++++++++
 .../stat/GradientOfMemoryConsumptionEvent.java  | 58 +++++++++++++++++
 .../stat/GradientOfRequestsInFlightEvent.java   | 58 +++++++++++++++++
 .../stat/MemberAverageLoadAverageEvent.java     | 50 ++++++++++++++
 .../MemberAverageMemoryConsumptionEvent.java    | 49 ++++++++++++++
 .../event/health/stat/MemberFaultEvent.java     | 68 ++++++++++++++++++++
 .../stat/MemberGradientOfLoadAverageEvent.java  | 50 ++++++++++++++
 .../MemberGradientOfMemoryConsumptionEvent.java | 50 ++++++++++++++
 ...emberSecondDerivativeOfLoadAverageEvent.java | 50 ++++++++++++++
 ...econdDerivativeOfMemoryConsumptionEvent.java | 50 ++++++++++++++
 .../SecondDerivativeOfLoadAverageEvent.java     | 58 +++++++++++++++++
 ...econdDerivativeOfMemoryConsumptionEvent.java | 49 ++++++++++++++
 ...SecondDerivativeOfRequestsInFlightEvent.java | 58 +++++++++++++++++
 16 files changed, 880 insertions(+)
----------------------------------------------------------------------