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/02/25 13:29:50 UTC
[1/2] git commit: php should be installed before agent
Repository: incubator-stratos
Updated Branches:
refs/heads/master a627251a1 -> 548537d93
php should be installed before agent
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/b15c6995
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/b15c6995
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/b15c6995
Branch: refs/heads/master
Commit: b15c699582fd5d2022f62436aded19ef427c52f4
Parents: f8cdad4
Author: Nirmal Fernando <ni...@apache.org>
Authored: Tue Feb 25 17:59:18 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Tue Feb 25 17:59:18 2014 +0530
----------------------------------------------------------------------
tools/puppet3/manifests/nodes.pp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b15c6995/tools/puppet3/manifests/nodes.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/manifests/nodes.pp b/tools/puppet3/manifests/nodes.pp
index 00e94b6..152001b 100644
--- a/tools/puppet3/manifests/nodes.pp
+++ b/tools/puppet3/manifests/nodes.pp
@@ -59,8 +59,8 @@ node /php/ inherits base {
class {'agent':}
class {'php':}
- #install agent before php
- Class['agent'] ~> Class['php']
+ #install php before agent
+ Class['php'] ~> Class['agent']
}
# loadbalancer cartridge node
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by ni...@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/548537d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/548537d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/548537d9
Branch: refs/heads/master
Commit: 548537d9381d315fb83d5a9ea2ec8a6df11b1bbc
Parents: b15c699 a627251
Author: Nirmal Fernando <ni...@apache.org>
Authored: Tue Feb 25 17:59:29 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Tue Feb 25 17:59:29 2014 +0530
----------------------------------------------------------------------
.../cloud/controller/pojo/Cartridge.java | 10 ++
.../controller/util/CloudControllerUtil.java | 2 +
.../console/cartridge_info.jag | 2 -
.../console/controllers/acs.jag | 6 +-
.../console/controllers/loginSubmit.jag | 3 -
.../console/controllers/manageTenants.jag | 5 +-
.../console/controllers/profileClient.jag | 3 +-
.../console/tenant_new.jag | 2 +-
.../partials/configure_stratos_wizard.hbs | 2 +-
.../themes/theme1/partials/mycartridges.hbs | 2 +-
.../theme1/partials/subscribe_cartridge.hbs | 116 +++++++++++--------
.../themes/theme1/partials/tenant_new.hbs | 8 +-
.../console/themes/theme1/renderers/login.js | 2 -
.../console/themes/theme1/ui/css/main.css | 5 +-
.../console/themes/theme1/ui/js/mycartridges.js | 2 +-
.../console/themes/theme1/ui/js/popup.js | 1 +
.../console/util/utility.jag | 43 ++++++-
17 files changed, 140 insertions(+), 74 deletions(-)
----------------------------------------------------------------------