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/6bede513 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/6bede513 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/6bede513 Branch: refs/heads/master Commit: 6bede5130142b832381bd15a54af348db1667816 Parents: 496d989 31eb2ae Author: Melan Nimesh <[email protected]> Authored: Tue Feb 25 10:28:23 2014 +0530 Committer: Melan Nimesh <[email protected]> Committed: Tue Feb 25 10:28:23 2014 +0530 ---------------------------------------------------------------------- .../publisher/CartridgeAgentEventPublisher.java | 48 ++++- .../publisher/HealthStatisticsNotifier.java | 4 +- tools/puppet3/modules/agent/manifests/init.pp | 2 +- .../modules/agent/manifests/initialize.pp | 27 ++- .../modules/agent/templates/bin/stratos.sh.erb | 3 +- .../templates/extensions/addons/_mysql.erb | 2 +- tools/puppet3/modules/java/manifests/init.pp | 14 +- tools/puppet3/modules/lb/manifests/init.pp | 2 +- .../puppet3/modules/lb/manifests/initialize.pp | 12 +- .../lb/templates/conf/loadbalancer.conf.erb | 8 + tools/puppet3/modules/mysql/manifests/init.pp | 20 +-- .../modules/mysql/templates/phpMyAdmin.conf.erb | 24 +-- tools/puppet3/modules/nodejs/manifests/init.pp | 18 +- tools/puppet3/modules/php/manifests/init.pp | 175 +++++++++++-------- .../puppet3/modules/php/manifests/init.pp.cent | 94 ++++++++++ 15 files changed, 323 insertions(+), 130 deletions(-) ----------------------------------------------------------------------
