You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2014/03/20 13:43:09 UTC
[2/5] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
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/d45e4a93
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d45e4a93
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d45e4a93
Branch: refs/heads/master
Commit: d45e4a935835fd86407e581ddf249ac1647eabfb
Parents: 64c0def 2fca019
Author: Udara Liyanage <ud...@wso2.com>
Authored: Wed Mar 19 05:28:11 2014 -0400
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Wed Mar 19 05:28:11 2014 -0400
----------------------------------------------------------------------
.../stratos/cartridge/agent/CartridgeAgent.java | 121 ++++++++++---------
.../apache/stratos/cartridge/agent/Main.java | 27 ++++-
.../config/CartridgeAgentConfiguration.java | 71 ++++++++---
.../exception/ParameterNotFoundException.java | 39 ++++++
.../manager/payload/BasicPayloadData.java | 2 +-
.../distribution/src/main/bin/stratos.sh | 4 +
tools/puppet3-agent/stratos_sendinfo.rb | 21 ++--
tools/stratos-installer/clean.sh | 0
tools/stratos-installer/conf/setup.conf | 15 ++-
.../cc/repository/conf/cloud-controller.xml | 12 ++
tools/stratos-installer/ec2.sh | 6 +
tools/stratos-installer/openstack.sh | 6 +
tools/stratos-installer/setup.sh | 12 +-
tools/stratos-installer/vcloud.sh | 69 +++++++++++
14 files changed, 310 insertions(+), 95 deletions(-)
----------------------------------------------------------------------