You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2014/03/20 13:51:24 UTC
[29/33] 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/0ba97e7a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/0ba97e7a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/0ba97e7a
Branch: refs/heads/master
Commit: 0ba97e7a7af445098302992cb740328156882c22
Parents: f6d50e8 3d7961e
Author: Nirmal Fernando <ni...@apache.org>
Authored: Thu Mar 20 13:14:25 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Thu Mar 20 13:14:25 2014 +0530
----------------------------------------------------------------------
.../stratos/cartridge/agent/CartridgeAgent.java | 2 +-
.../config/CartridgeAgentConfiguration.java | 71 ++++++++++++++------
.../exception/ParameterNotFoundException.java | 39 +++++++++++
.../console/cartridge_info.jag | 7 +-
.../controllers/cartridgeSubscribeSubmit.jag | 24 +++----
.../console/subscribe_cartridge.jag | 2 +
.../console/themes/theme1/pages/index.hbs | 12 +---
.../themes/theme1/partials/cartridge_info.hbs | 38 +++++++----
.../themes/theme1/partials/cartridges.hbs | 24 ++++---
.../partials/configure_stratos_wizard.hbs | 62 +++++++++--------
.../console/themes/theme1/partials/header.hbs | 6 +-
.../themes/theme1/partials/mycartridges.hbs | 17 +++--
.../theme1/partials/tenant_management.hbs | 60 ++++-------------
.../themes/theme1/partials/tenant_new.hbs | 2 +-
.../themes/theme1/renderers/cartridge_info.js | 2 +-
.../themes/theme1/renderers/cartridges.js | 10 +--
.../console/themes/theme1/renderers/index.js | 12 ++--
.../theme1/renderers/subscribe_cartridge.js | 10 ++-
.../console/themes/theme1/ui/css/main.css | 66 ++++++++++++------
.../console/util/utility.jag | 11 ++-
.../stratos/rest/endpoint/mock/MockContext.java | 9 ++-
.../rest/endpoint/mock/StratosTestAdmin.java | 7 +-
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 +++++++++++++++++++
30 files changed, 415 insertions(+), 219 deletions(-)
----------------------------------------------------------------------