summaryrefslogtreecommitdiff
path: root/puppet/modules/site_haproxy/manifests
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-02-13 17:22:18 +0100
committervarac <varacanero@zeromail.org>2014-02-13 17:22:18 +0100
commit761fe6f40058612d6ac0ce88103c9a4f35877ef8 (patch)
treecdacb4408633076fde04213fd27a48aa6c990a2e /puppet/modules/site_haproxy/manifests
parent251c250fe5cf44c99a74d4359cb29b0bf165f3af (diff)
parentc1d1d9d7cf6fefd1203cc09a66c2e0230b930b5e (diff)
Merge branch 'fix_develop' into develop
This was needed so current develop plays nicely with latest leap_cli.
Diffstat (limited to 'puppet/modules/site_haproxy/manifests')
0 files changed, 0 insertions, 0 deletions