You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2014/02/05 14:38:18 UTC
[1/2] git commit: fixing a bug in SM topology model updating
Updated Branches:
refs/heads/master 263e2f75c -> 655042e15
fixing a bug in SM topology model updating
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/216901d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/216901d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/216901d8
Branch: refs/heads/master
Commit: 216901d8eea5f21221a75e188819813b94292676
Parents: 1e0496c
Author: Isuru <is...@wso2.com>
Authored: Wed Feb 5 19:07:28 2014 +0530
Committer: Isuru <is...@wso2.com>
Committed: Wed Feb 5 19:07:28 2014 +0530
----------------------------------------------------------------------
.../manager/topology/model/TopologyClusterInformationModel.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/216901d8/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/topology/model/TopologyClusterInformationModel.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/topology/model/TopologyClusterInformationModel.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/topology/model/TopologyClusterInformationModel.java
index 284e36b..232e8a9 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/topology/model/TopologyClusterInformationModel.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/topology/model/TopologyClusterInformationModel.java
@@ -169,7 +169,8 @@ public class TopologyClusterInformationModel {
//Create CartridgeTypeContext instance
cartridgeTypeContextSet = new HashSet<CartridgeTypeContext>();
//link the SubscriptionAliasContext set to CartridgeTypeContext instance
- cartridgeTypeContext.setSubscriptionAliasContextSet(subscriptionAliasContextSet);
+ //////////////cartridgeTypeContext.setSubscriptionAliasContextSet(subscriptionAliasContextSet);
+ cartridgeTypeContextSet.add(cartridgeTypeContext);
//link the CartridgeTypeContext set to the [tenant Id -> CartridgeTypeContext] map
tenantIdToCartridgeTypeContextMap.put(tenantId, cartridgeTypeContextSet);
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by is...@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/655042e1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/655042e1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/655042e1
Branch: refs/heads/master
Commit: 655042e15a7e52b9d720d14c1f00d2d23e131a01
Parents: 216901d 263e2f7
Author: Isuru <is...@wso2.com>
Authored: Wed Feb 5 19:07:42 2014 +0530
Committer: Isuru <is...@wso2.com>
Committed: Wed Feb 5 19:07:42 2014 +0530
----------------------------------------------------------------------
.../stratos/cli/RestCommandLineService.java | 160 +++---
.../stratos/cli/beans/cartridge/Cartridge.java | 9 +
.../controller/topology/TopologyBuilder.java | 2 +-
.../topology/TopologyEventPublisher.java | 5 +-
.../StratosManagerTopologyReceiver.java | 39 ++
.../event/topology/InstanceSpawnedEvent.java | 19 +
.../InstanceSpawnedMessageProcessor.java | 2 +
.../rest/endpoint/services/StratosAdmin.java | 1 +
.../load-balancer/haproxy-extension/INSTALL.txt | 19 +-
.../src/main/bin/haproxy-extension.sh | 7 +-
.../stratos/haproxy/extension/Constants.java | 1 +
.../haproxy/extension/HAProxyConfigWriter.java | 36 +-
.../haproxy/extension/HAProxyContext.java | 8 +
tools/stratos-installer/conf/setup.conf | 2 +-
tools/stratos-installer/resources/mysql.sql | 485 +++++++++++++++++++
tools/stratos-installer/setup.sh | 33 +-
16 files changed, 693 insertions(+), 135 deletions(-)
----------------------------------------------------------------------