Code Review / puppet-modules / puppetlabs-firewall.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 317ee17 a640a43)
Merge pull request #505 from jpds/ipv4-encap
authorJT (Jonny) <jonathan.tripathy@puppetlabs.com>
Wed, 1 Apr 2015 13:51:51 +0000 (14:51 +0100)
committerJT (Jonny) <jonathan.tripathy@puppetlabs.com>
Wed, 1 Apr 2015 13:51:51 +0000 (14:51 +0100)
Added ipv{4,6} to protocol list

1  2 
README.markdown patch | diff1 | diff2 | blob | history

diff --cc README.markdown
Simple merge