]> review.fuel-infra Code Review - puppet-modules/puppetlabs-firewall.git/commit
Merge branch '1.2.x' into master
authorHunter Haugen <hunter@puppetlabs.com>
Wed, 9 Jul 2014 20:46:32 +0000 (13:46 -0700)
committerHunter Haugen <hunter@puppetlabs.com>
Wed, 9 Jul 2014 20:46:39 +0000 (13:46 -0700)
commit308f81ea547a1e7be041f71ae17ccd349b00d14e
tree3e2790cf8801a85eaf0100cb2e2bc6e309503ffa
parent3a150b3be4f9475b3542cac0191eadf736e0dcff
parentfa60f5acdfb72a26885a98725a960802b3d1da4f
Merge branch '1.2.x' into master

Conflicts:
CHANGELOG.md
Gemfile
Modulefile
metadata.json
lib/puppet/provider/firewall/iptables.rb
spec/acceptance/resource_cmd_spec.rb