Merge branch 'master' into 5.1.0

This commit is contained in:
Tom Eastep 2016-12-01 19:35:14 -08:00
commit 5ae062317f
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
2 changed files with 2 additions and 2 deletions

View File

@ -1577,7 +1577,7 @@ sub finish_providers() {
if ( $family == F_IPV4 ) {
emit( " run_ip route replace default scope global table $default \$FALLBACK_ROUTE" );
} ele {
} else {
emit( " run_ip route delete default scope global table $default \$FALLBACK_ROUTE" );
emit( " run_ip route add default scope global table $default \$FALLBACK_ROUTE" );
}

View File

@ -44,7 +44,7 @@
</caution>
<important>
<para>/etc/shorewall/mangle superseded /etc/shorewall/tcruels in Shorewall
<para>/etc/shorewall/mangle superseded /etc/shorewall/tcrules in Shorewall
4.6.0. /etc/shorwall/tcrules is still supported but its use is
deprecated.</para>
</important>