diff options
| author | Azul <azul@riseup.net> | 2014-08-01 19:10:17 +0200 |
|---|---|---|
| committer | Azul <azul@riseup.net> | 2014-08-01 19:10:17 +0200 |
| commit | 3b93372bd9cc98f87e21b15308ef5079c2e18983 (patch) | |
| tree | 95e05d85270e526a831e0d6c46cd22356b81c6fe /puppet/modules/site_haproxy | |
| parent | 2e5d1a8cf2228a87d382bbf8a58d3f485b1ead65 (diff) | |
| parent | 42327f4881022424bed354356756ab5815d5ba3f (diff) | |
Merge branch 'feature/replication-in-tapicero-security' into develop
Diffstat (limited to 'puppet/modules/site_haproxy')
0 files changed, 0 insertions, 0 deletions