]> gitweb.fluxo.info Git - puppet-shorewall.git/commitdiff
projects / puppet-shorewall.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 589f572 edd5db0)
Merge remote-tracking branch 'shared/master' into develop master
authorSilvio Rhatto <rhatto@riseup.net>
Wed, 23 Mar 2016 23:01:11 +0000 (20:01 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Wed, 23 Mar 2016 23:01:11 +0000 (20:01 -0300)
Conflicts:
manifests/tunnel.pp


Trivial merge
Puppet module for shorewall