You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2013/10/25 07:39:32 UTC
[1/3] git commit: adding mb ip and port
Updated Branches:
refs/heads/master 281df2a85 -> 3a18521e8
adding mb ip and port
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/679eb35b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/679eb35b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/679eb35b
Branch: refs/heads/master
Commit: 679eb35bfc29519fa2298dba964df719251da0f9
Parents: 1622dfc
Author: rekathiru <rt...@gmail.com>
Authored: Fri Oct 25 09:58:12 2013 +0530
Committer: rekathiru <rt...@gmail.com>
Committed: Fri Oct 25 09:58:12 2013 +0530
----------------------------------------------------------------------
.../src/main/resources/conf/cartridge-config.properties | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/679eb35b/features/adc/org.apache.stratos.adc.mgt.server.feature/src/main/resources/conf/cartridge-config.properties
----------------------------------------------------------------------
diff --git a/features/adc/org.apache.stratos.adc.mgt.server.feature/src/main/resources/conf/cartridge-config.properties b/features/adc/org.apache.stratos.adc.mgt.server.feature/src/main/resources/conf/cartridge-config.properties
index e360277..0f8743a 100644
--- a/features/adc/org.apache.stratos.adc.mgt.server.feature/src/main/resources/conf/cartridge-config.properties
+++ b/features/adc/org.apache.stratos.adc.mgt.server.feature/src/main/resources/conf/cartridge-config.properties
@@ -35,7 +35,8 @@ adc.jdbc.username=wso2carbon
adc.jdbc.password=wso2carbon
adc.jdbc.driver=org.h2.Driver
-mb.server.ip=cc.wso2.com:5673
+mb.ip=mb.stratos.apache.org
+mb.port=5677
feature.externalrepo.validation.enabled=true
feature.internalrepo.enabled=false
[2/3] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by re...@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/062b2f48
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/062b2f48
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/062b2f48
Branch: refs/heads/master
Commit: 062b2f480ab94da8d6799cbd7718e6e8f2aa9a54
Parents: 679eb35 bb71766
Author: rekathiru <rt...@gmail.com>
Authored: Fri Oct 25 09:58:23 2013 +0530
Committer: rekathiru <rt...@gmail.com>
Committed: Fri Oct 25 09:58:23 2013 +0530
----------------------------------------------------------------------
.../cloud/controller/CloudControllerClient.java | 6 +-
.../autoscaler/exception/SpawningException.java | 2 +-
products/cartridge-agent/README.txt | 27 +++++
products/cartridge-agent/pom.xml | 108 ++++++++++++++++++
.../src/main/assembly/assembly.xml | 52 +++++++++
.../src/main/bin/cartridge-agent.sh | 24 ++++
.../stratos/cartridge/agent/CartridgeAgent.java | 114 +++++++++++++++++++
.../stratos/cartridge/agent/EventPublisher.java | 101 ++++++++++++++++
.../apache/stratos/cartridge/agent/Main.java | 58 ++++++++++
.../stratos/cartridge/agent/UserData.java | 71 ++++++++++++
.../src/main/resources/jndi.properties | 22 ++++
.../src/main/resources/log4j.properties | 37 ++++++
12 files changed, 618 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[3/3] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by re...@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/3a18521e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/3a18521e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/3a18521e
Branch: refs/heads/master
Commit: 3a18521e8a60811dc16699ec5dd50621d6022cae
Parents: 062b2f4 281df2a
Author: rekathiru <rt...@gmail.com>
Authored: Fri Oct 25 11:09:03 2013 +0530
Committer: rekathiru <rt...@gmail.com>
Committed: Fri Oct 25 11:09:03 2013 +0530
----------------------------------------------------------------------
.../src/main/conf/loadbalancer.conf | 57 --------------------
.../synapse-configs/default/sequences/main.xml | 2 +-
2 files changed, 1 insertion(+), 58 deletions(-)
----------------------------------------------------------------------