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/aced0071 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/aced0071 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/aced0071 Branch: refs/heads/master Commit: aced007169acd23069de9a8c3af3bc5ba703478e Parents: 361dbec 24766f9 Author: M. Isuru Tharanga Chrishantha Perera <[email protected]> Authored: Thu Mar 20 22:57:48 2014 +0530 Committer: M. Isuru Tharanga Chrishantha Perera <[email protected]> Committed: Thu Mar 20 22:57:48 2014 +0530 ---------------------------------------------------------------------- .../modules/p2-profile-gen/carbon.product | 34 - .../modules/p2-profile-gen/pom.xml | 1040 ++++++------------ tools/puppet3/manifests/nodes.pp | 53 +- .../lb/templates/conf/axis2/axis2.xml.erb | 4 +- tools/puppet3/modules/mysql/manifests/init.pp | 26 + .../modules/mysql/templates/000-default.erb | 41 + .../puppet3/modules/mysql/templates/my.cnf.erb | 127 +++ tools/puppet3/modules/tomcat/manifests/init.pp | 41 +- .../modules/tomcat/templates/server.xml.erb | 143 +++ 9 files changed, 703 insertions(+), 806 deletions(-) ----------------------------------------------------------------------
