extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-20 09:47:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflicts in release notes

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3491 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-02-18 15:22:03 +00:00
parent 35f5672c11
commit 3d48928a9e
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall/changelog.txt
View File

@ -80,3 +80,5 @@ Changes in 3.1.x.
35) Add -t option 35) Add -t option
36) Restore log messages. 36) Restore log messages.
37) Fix "shorewall capabilities" with VERBOSITY < 2.

5
Shorewall/releasenotes.txt
View File

@ -40,7 +40,10 @@ Problems Corrected in 3.1.7
3) Log messages for "started", "restarted" and "restored" are once again 3) Log messages for "started", "restarted" and "restored" are once again
generated. generated.
Other changes in 3.1.6 4) If VERBOSITY was set to a value less than 2, then "shorewall show
capabilities" produced no output.
Other changes in 3.1.7
1) 'tcpsyn' has been changed to 'tcp:syn' (tcpsyn was added in 3.1.6). 1) 'tcpsyn' has been changed to 'tcp:syn' (tcpsyn was added in 3.1.6).
This new syntax is easier to extend in the future than was the old. This new syntax is easier to extend in the future than was the old.

1
Shorewall/shorewall
View File

@ -936,6 +936,7 @@ show_command() {
capabilities) capabilities)
[ $# -gt 1 ] && usage 1 [ $# -gt 1 ] && usage 1
determine_capabilities determine_capabilities
VERBOSE=2
report_capabilities report_capabilities
;; ;;
actions) actions)