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/17 06:44:12 UTC

[1/2] git commit: Removing a temporary comment

Updated Branches:
  refs/heads/master 94d8f915d -> d57ee15fb


 Removing a temporary comment


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

Branch: refs/heads/master
Commit: 088236a96c7eeb933e1e07abdc1b5e1a8f3b4289
Parents: 8e2cec7
Author: Udara Liyanage <ud...@wso2.com>
Authored: Sun Nov 17 11:11:43 2013 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Sun Nov 17 11:11:43 2013 -0500

----------------------------------------------------------------------
 .../stratos/cloud/controller/impl/CloudControllerServiceImpl.java   | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/088236a9/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
index f5db4f7..bcb5cd6 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
@@ -502,7 +502,6 @@ public class CloudControllerServiceImpl implements CloudControllerService {
 
     @Override
     public String startInstances(String clusterId, Partition partition, int noOfInstancesToBeSpawned) {
-        log.info("aaaaaaaaaaaaaaaaaaaaaaaa");
         //TODO
         return null;
     }

[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/d57ee15f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d57ee15f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d57ee15f

Branch: refs/heads/master
Commit: d57ee15fb8d99f6b6dbeb853a3d26d899ae251de
Parents: 088236a 94d8f91
Author: Udara Liyanage <ud...@wso2.com>
Authored: Sun Nov 17 11:12:56 2013 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Sun Nov 17 11:12:56 2013 -0500

----------------------------------------------------------------------
 .../common/topology/TopologyReceiver.java       | 44 +++++----
 .../extension/api/LoadBalancerExtension.java    | 32 +++++--
 .../api/LoadBalancerStatsNotifier.java          | 10 +-
 .../broker/heartbeat/TopicHealthChecker.java    |  8 +-
 .../broker/subscribe/TopicSubscriber.java       | 26 +++--
 .../topology/TopologyEventMessageDelegator.java | 12 ++-
 .../load-balancer/haproxy-extension/INSTALL.txt | 23 +++++
 .../load-balancer/haproxy-extension/README.txt  | 26 +++++
 .../haproxy-extension/src/main/assembly/bin.xml | 13 ++-
 .../src/main/bin/haproxy-extension.sh           | 24 +++--
 .../src/main/conf/log4j.properties              | 39 ++++++++
 .../stratos/haproxy/extension/CommandUtil.java  | 66 +++++++++++++
 .../stratos/haproxy/extension/HAProxy.java      | 64 ++++---------
 .../haproxy/extension/HAProxyConfigWriter.java  | 55 +++++------
 .../haproxy/extension/HAProxyContext.java       | 99 ++++++++++++++++++++
 .../haproxy/extension/HAProxyStatsReader.java   | 63 +++++++++++++
 .../apache/stratos/haproxy/extension/Main.java  | 42 +++------
 .../src/main/resources/log4j.properties         | 37 --------
 .../src/main/resources/velocity.properties      |  1 -
 .../src/main/scripts/get-weight.sh              | 23 +++++
 .../src/main/templates/haproxy.cfg.template     |  2 +-
 .../distribution/src/main/conf/log4j.properties |  3 +
 .../distribution/src/main/bin/stratos.sh        |  4 +-
 .../distribution/src/main/conf/log4j.properties |  2 +
 24 files changed, 528 insertions(+), 190 deletions(-)
----------------------------------------------------------------------