From: Ken Barber <ken@bob.sh>
Date: Wed, 20 Jun 2012 17:37:34 +0000 (+0100)
Subject: Merge branch 'fix_mark'
X-Git-Tag: 0.1.0~19
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a38d302d64b38070d2cf13d4df3912de9b435751;p=puppet-modules%2Fpuppetlabs-firewall.git

Merge branch 'fix_mark'

* 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+.
---

a38d302d64b38070d2cf13d4df3912de9b435751