You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2013/12/03 14:17:45 UTC
[1/2] git commit: removing invalid registry persistence
Updated Branches:
refs/heads/master 7701b25b3 -> b1999c5de
removing invalid registry persistence
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/6af5fef6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/6af5fef6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/6af5fef6
Branch: refs/heads/master
Commit: 6af5fef6df92eab68f0ac9c8b25eb1569fbac8c6
Parents: 5a43d56
Author: Nirmal Fernando <ni...@apache.org>
Authored: Tue Dec 3 18:44:58 2013 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Tue Dec 3 18:44:58 2013 +0530
----------------------------------------------------------------------
.../apache/stratos/cloud/controller/topology/TopologyManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6af5fef6/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyManager.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyManager.java
index 098ad49..29c81d7 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyManager.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyManager.java
@@ -120,7 +120,7 @@ public class TopologyManager {
public synchronized void updateTopology(Topology topology) {
synchronized (TopologyManager.class) {
this.topology = topology;
- CloudControllerUtil.persist(this.topology);
+// CloudControllerUtil.persist(this.topology);
if (log.isDebugEnabled()) {
Gson gson = new Gson();
String message = gson.toJson(topology);
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by ni...@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/b1999c5d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/b1999c5d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/b1999c5d
Branch: refs/heads/master
Commit: b1999c5de5278733ad974ea1144d5f8e7593b663
Parents: 6af5fef 7701b25
Author: Nirmal Fernando <ni...@apache.org>
Authored: Tue Dec 3 18:45:09 2013 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Tue Dec 3 18:45:09 2013 +0530
----------------------------------------------------------------------
.../health/HealthEventMessageDelegator.java | 5 +-
.../controller/topology/TopologyBuilder.java | 11 +-
.../load/balancer/LoadBalancerContext.java | 12 +-
.../balancer/LoadBalancerTopologyReceiver.java | 24 +--
.../conf/LoadBalancerConfiguration.java | 30 +++-
.../test/LoadBalancerConfigurationTest.java | 150 ++++++++++++++++---
.../sample/configuration/loadbalancer1.conf | 8 +-
.../sample/configuration/loadbalancer2.conf | 10 +-
.../sample/configuration/loadbalancer3.conf | 8 +-
.../messaging/domain/topology/Cluster.java | 19 ++-
.../messaging/domain/topology/Topology.java | 3 +
.../topology/ClusterCreatedEventProcessor.java | 2 +-
.../FaultMessageEventFormatter.xml | 2 +-
.../haproxy/extension/HAProxyConfigWriter.java | 29 ++--
.../git/impl/GitBasedArtifactRepository.java | 136 +++++++++--------
.../event/subscriber/ArtifactListener.java | 6 +-
.../cartridge/agent/event/subscriber/Main.java | 13 +-
.../subscriber/RepositoryFileListener.java | 38 +++++
.../src/main/conf/loadbalancer.conf | 43 ++++++
tools/stratos-installer/conf/setup.conf | 14 ++
.../config/cep/repository/conf/jndi.properties | 13 ++
tools/stratos-installer/setup.sh | 67 ++++++++-
tools/stratos-installer/start-servers.sh | 15 +-
23 files changed, 504 insertions(+), 154 deletions(-)
----------------------------------------------------------------------