Merge branch '4.0.0' of https://git-wip-us.apache.org/repos/asf/stratos into 4.0.0
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/07965e54 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/07965e54 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/07965e54 Branch: refs/heads/4.0.0 Commit: 07965e544ae0e3fc12bbcacb85992fb0199b4a2a Parents: 6b6e509 862a71d Author: Manula Thantriwatte <[email protected]> Authored: Thu Jul 3 12:57:13 2014 +0000 Committer: Manula Thantriwatte <[email protected]> Committed: Thu Jul 3 12:57:13 2014 +0000 ---------------------------------------------------------------------- tools/puppet3/modules/haproxy/files/README.txt | 12 +++ tools/puppet3/modules/haproxy/manifests/init.pp | 70 ++++++++++++++++++ .../modules/haproxy/manifests/initialize.pp | 77 ++++++++++++++++++++ .../modules/haproxy/manifests/push_templates.pp | 30 ++++++++ .../puppet3/modules/haproxy/manifests/start.pp | 25 +++++++ .../templates/bin/haproxy-extension.sh.erb | 48 ++++++++++++ .../haproxy/templates/conf/jndi.properties.erb | 33 +++++++++ 7 files changed, 295 insertions(+) ----------------------------------------------------------------------
