diff options
| author | Micah Anderson <micah@leap.se> | 2013-09-03 12:30:07 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2013-09-03 12:30:07 -0400 |
| commit | b25d10864798e50dd51b9404903d3c493b44a65e (patch) | |
| tree | 7dfee18dfbac6b37fc24d0e5da20878a066ffe99 /puppet/modules/site_haproxy | |
| parent | 66fcf9bd9595a09d70e7d4131660340be5ae603e (diff) | |
| parent | cfdbad27fe0b1c5e98b127f2c3d22258e233ef11 (diff) | |
Merge branch 'feature/helo_access' into develop
Conflicts:
puppet/modules/site_postfix/manifests/mx/smtpd_checks.pp
Change-Id: I51555935f9d9409e45809d6df021b10e926ea520
Diffstat (limited to 'puppet/modules/site_haproxy')
0 files changed, 0 insertions, 0 deletions