You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by pr...@apache.org on 2014/04/09 07:32:09 UTC
[1/2] git commit: fixing STRATOS-485
Repository: incubator-stratos
Updated Branches:
refs/heads/master 94c91152a -> a1f2609a9
fixing STRATOS-485
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/36b6e266
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/36b6e266
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/36b6e266
Branch: refs/heads/master
Commit: 36b6e266cc9447dacf594754a1f89ed5c803f6a7
Parents: b9f6e85
Author: Pradeep Fernando <pr...@gmail.com>
Authored: Wed Apr 9 11:01:24 2014 +0530
Committer: Pradeep Fernando <pr...@gmail.com>
Committed: Wed Apr 9 11:01:24 2014 +0530
----------------------------------------------------------------------
.../cartridge-agent/modules/distribution/src/main/bin/stratos.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/36b6e266/products/cartridge-agent/modules/distribution/src/main/bin/stratos.sh
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/modules/distribution/src/main/bin/stratos.sh b/products/cartridge-agent/modules/distribution/src/main/bin/stratos.sh
index 922fd8f..db86d7d 100644
--- a/products/cartridge-agent/modules/distribution/src/main/bin/stratos.sh
+++ b/products/cartridge-agent/modules/distribution/src/main/bin/stratos.sh
@@ -32,7 +32,7 @@ properties="-Dmb.ip=MB-IP
-Djndi.properties.template.file.path=${script_path}/../conf/templates/jndi.properties.template
-Djndi.properties.dir=${script_path}/../conf
-Dlog4j.properties.file.path=${script_path}/../conf/log4j.properties
- -Dparam.file.path=/opt/apache-stratos-cartridge-agent/payload/launch-params
+ -Dparam.file.path=${script_path}/../payload/launch-params
-Dextensions.dir=${script_path}/../extensions
-Dcep.stats.publisher.enabled=true
-Djavax.net.ssl.trustStore=CERT-TRUSTSTORE
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by pr...@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/a1f2609a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/a1f2609a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/a1f2609a
Branch: refs/heads/master
Commit: a1f2609a9ed25435c5865877a93a472354fdcccb
Parents: 36b6e26 94c9115
Author: Pradeep Fernando <pr...@gmail.com>
Authored: Wed Apr 9 11:01:43 2014 +0530
Committer: Pradeep Fernando <pr...@gmail.com>
Committed: Wed Apr 9 11:01:43 2014 +0530
----------------------------------------------------------------------
.../balancer/mediators/LocationReWriter.java | 80 ++++++++++++++++++++
.../manager/CartridgeSubscriptionManager.java | 2 +-
.../synapse-configs/default/sequences/main.xml | 20 +----
3 files changed, 85 insertions(+), 17 deletions(-)
----------------------------------------------------------------------