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/24766f95 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/24766f95 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/24766f95 Branch: refs/heads/master Commit: 24766f9580f61899dd3b6742cbc4987d6f498436 Parents: 17e61d1 130206b Author: Nirmal Fernando <[email protected]> Authored: Thu Mar 20 20:03:30 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Thu Mar 20 20:03:30 2014 +0530 ---------------------------------------------------------------------- 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 +++++++++++++++++++ 7 files changed, 376 insertions(+), 59 deletions(-) ----------------------------------------------------------------------
