Updated Branches: refs/heads/master 258ebf0af -> 2bc47a0d6
removing unused variables and correcting values in cartridge-config.properties Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/6612cb92 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/6612cb92 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/6612cb92 Branch: refs/heads/master Commit: 6612cb92a35a5d3b7ca8a1188bf2e3589e2e4da6 Parents: 7c2f7b6 Author: Udara Liyanage <[email protected]> Authored: Wed Dec 18 14:33:30 2013 -0500 Committer: Udara Liyanage <[email protected]> Committed: Wed Dec 18 14:33:30 2013 -0500 ---------------------------------------------------------------------- .../distribution/src/main/conf/cartridge-config.properties | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6612cb92/products/stratos-controller/modules/distribution/src/main/conf/cartridge-config.properties ---------------------------------------------------------------------- diff --git a/products/stratos-controller/modules/distribution/src/main/conf/cartridge-config.properties b/products/stratos-controller/modules/distribution/src/main/conf/cartridge-config.properties index a420b8b..4750702 100644 --- a/products/stratos-controller/modules/distribution/src/main/conf/cartridge-config.properties +++ b/products/stratos-controller/modules/distribution/src/main/conf/cartridge-config.properties @@ -20,11 +20,10 @@ # # Configuration properties - +#this file is in product sc.ip=stratos_ip -autoscalerService.url=https://cc.stratos.apache.org:9444/services/CloudControllerService/ autoscaler.service.url=https://as.stratos.apache.org:9446/services/AutoScalerService/ -cloud.controller.service.url=https://cc.stratos.apache.org:9446/services/CloudControllerService/ +cloud.controller.service.url=https://cc.stratos.apache.org:9444/services/CloudControllerService/ autoscaler.time.out=190000 cartridge.agent.epr=https://stratos_ip:9447/services/CartridgeAgentService git.host.name=s2_hostname
