]> review.fuel-infra Code Review - puppet-modules/puppetlabs-firewall.git/commitdiff
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)
Conflicts:
CHANGELOG.md
Gemfile
Modulefile
metadata.json

1  2 
lib/puppet/provider/firewall/iptables.rb
spec/acceptance/resource_cmd_spec.rb

Simple merge