diff options
| author | Lebedev Vadim <abraham1901@gmail.com> | 2016-04-29 13:05:55 +0300 |
|---|---|---|
| committer | Lebedev Vadim <abraham1901@gmail.com> | 2016-04-29 13:05:55 +0300 |
| commit | ef445bc9b9482f5e6efa7f18fdc79efc60fccb5c (patch) | |
| tree | 8cb787458aab582df8372ce4579de6d9d19a5699 /manifests/zone.pp | |
| parent | 79503b830d17af99427c69eb64c2e21a7c36485f (diff) | |
| parent | eaba8159fcfc38dbc72e2476e753b05ea7554d55 (diff) | |
Merge branch 'master' of https://github.com/duritong/puppet-shorewall
Conflicts:
manifests/debian.pp
manifests/managed_file.pp
Diffstat (limited to 'manifests/zone.pp')
0 files changed, 0 insertions, 0 deletions