Merge remote-tracking branch 'ms/iptables-conntrack' into next

This commit is contained in:
Michael Tremer
2016-01-22 00:54:14 +00:00
15 changed files with 122 additions and 21 deletions

View File

@@ -0,0 +1,2 @@
# Disable automatic conntrack helper assignment
options nf_conntrack nf_conntrack_helper=0