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/ef9f8161 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ef9f8161 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ef9f8161 Branch: refs/heads/master Commit: ef9f81618ff5c7d1219f3857cb08d21555d47c12 Parents: 2df2c4a 3b029b3 Author: Pradeep Fernando <[email protected]> Authored: Fri Apr 4 11:41:30 2014 +0530 Committer: Pradeep Fernando <[email protected]> Committed: Fri Apr 4 11:41:30 2014 +0530 ---------------------------------------------------------------------- .../controllers/cartridgeSubscribeSubmit.jag | 8 + .../themes/theme1/partials/mycartridges.hbs | 4 +- .../theme1/partials/subscribe_cartridge.hbs | 11 +- .../console/themes/theme1/ui/css/main.css | 3 + .../manager/CartridgeSubscriptionManager.java | 55 +- .../model/TopologyClusterInformationModel.java | 23 + tools/stratos-installer/clean.sh | 39 +- tools/stratos-installer/conf/setup.conf | 95 +-- tools/stratos-installer/conf/stratos-setup.conf | 103 --- tools/stratos-installer/ec2.sh | 49 +- tools/stratos-installer/openstack.sh | 37 +- tools/stratos-installer/setup.sh | 825 +++++++++---------- tools/stratos-installer/start-servers.sh | 107 +-- tools/stratos-installer/stratos-clean.sh | 104 --- tools/stratos-installer/stratos-db-clean.sh | 24 - tools/stratos-installer/stratos-ec2.sh | 56 -- tools/stratos-installer/stratos-openstack.sh | 52 -- tools/stratos-installer/stratos-setup.sh | 596 -------------- .../stratos-installer/stratos-start-servers.sh | 96 --- tools/stratos-installer/stratos-vcloud.sh | 52 -- tools/stratos-installer/vcloud.sh | 37 +- 21 files changed, 548 insertions(+), 1828 deletions(-) ----------------------------------------------------------------------
