| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2012-06-20 | fix another merge issue | Micah Anderson | |
| 2012-06-20 | Merge remote-tracking branch 'immerda/master' into riseup | Micah Anderson | |
| NOTE: the conflicts in the files/shorewall.conf.Debian.squeeze I resolved by favoring the actual debian squeeze shorewall.conf, there were a few options in the immerda one that were not the same. Conflicts: README files/shorewall.conf.Debian.squeeze manifests/base.pp manifests/blacklist.pp manifests/debian.pp manifests/host.pp manifests/init.pp manifests/interface.pp manifests/masq.pp manifests/nat.pp manifests/params.pp manifests/policy.pp manifests/proxyarp.pp manifests/rfc1918.pp manifests/routestopped.pp manifests/rule.pp manifests/rule_section.pp manifests/rules/out/ekeyd.pp manifests/zone.pp | |||
| 2011-08-04 | refactor things to use the concat module | Marcel Haerry | |
| 2010-12-16 | Internal refactoring of shorewall::interface | intrigeri | |
| ... for more consistent options management. The public API does not change. | |||
| 2010-12-16 | New add_options parameter to shorewall::interface. | intrigeri | |
| 2010-10-17 | Merge remote branch 'riseup/master' | intrigeri | |
| Conflicts: files/debian/default manifests/init.pp templates/debian/default templates/debian_default.erb | |||
| 2009-12-07 | factored everything out in its own file | Marcel Haerry | |
 |
index : puppet_shorewall.git | |
| [puppet_shorewall] | git repository hosting |
| summaryrefslogtreecommitdiff |