diff options
| author | varac <varacanero@zeromail.org> | 2014-04-10 17:30:35 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2014-04-10 17:30:35 +0200 |
| commit | 98ed287783baad657bb2b0297de34629d14bb2f3 (patch) | |
| tree | 1cd05629de1fe17395e8b375597fa1c4ac6e48ca /puppet/modules/site_haproxy/manifests | |
| parent | 47c98e75f502c6ca77c4b46bb326959e569f501e (diff) | |
| parent | c8f9eaf3db509d8e678a7de0e363e14b91377e22 (diff) | |
Merge branch '0.6' into develop
Diffstat (limited to 'puppet/modules/site_haproxy/manifests')
0 files changed, 0 insertions, 0 deletions