]> gitweb.fluxo.info Git - puppet-shorewall.git/commitdiff
projects / puppet-shorewall.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 58103ed e511291)
Merge remote-tracking branch 'riseup/master'
authormh <mh@immerda.ch>
Wed, 2 Jan 2013 18:46:18 +0000 (19:46 +0100)
committermh <mh@immerda.ch>
Wed, 2 Jan 2013 18:46:18 +0000 (19:46 +0100)
Conflicts:
files/shorewall.conf.CentOS.6
files/shorewall.conf.Debian.wheezy

1  2 
manifests/base.pp patch | diff1 | diff2 | blob | history

diff --cc manifests/base.pp
Simple merge
Puppet module for shorewall