]> review.fuel-infra Code Review - puppet-modules/puppetlabs-firewall.git/commitdiff
Code Review / puppet-modules / puppetlabs-firewall.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: c991c2b 8327e6b)
Merge branch 'fix_mark'
authorKen Barber <ken@bob.sh>
Wed, 20 Jun 2012 17:37:34 +0000 (18:37 +0100)
committerKen Barber <ken@bob.sh>
Wed, 20 Jun 2012 17:37:34 +0000 (18:37 +0100)
* fix_mark:
  (#14755) Stub iptables_version for now so tests run on non-Linux hosts
  (#14755) Fix mark to not repeat rules with iptables 1.4.1+.


Trivial merge