diff options
| author | varac <varacanero@zeromail.org> | 2014-09-03 23:08:08 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2014-09-03 23:08:08 +0200 |
| commit | 0df84cf7987c3047ecc0353e8d29c2c38437a5a2 (patch) | |
| tree | c0db8548571cba8ef8bb5c2a258136c97780acf7 /provider_base/lib/macros/haproxy.rb | |
| parent | a54b82ff7cdae2e44bc3c159473ca03e283f0746 (diff) | |
| parent | b806d84a2fc292e3fb8a3f5fd1fb029c2cdb629e (diff) | |
Merge branch 'master' into develop
Conflicts:
platform.rb
puppet/modules/site_config/manifests/hosts.pp
Diffstat (limited to 'provider_base/lib/macros/haproxy.rb')
0 files changed, 0 insertions, 0 deletions