summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-07-01 15:09:07 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-07-01 15:09:07 +0200
commit4fd98529572b57f494597a34f04ced96ef1031a2 (patch)
treea2abace73c6cfcfa9db49d4c04ed2a1e831cef74 /ChangeLog
parent78543b7e31ea9559108d15fd645862db7dd63913 (diff)
parenta16cbe655541421fefdcc852087219228bbc5c94 (diff)
downloadrsyslog-4fd98529572b57f494597a34f04ced96ef1031a2.tar.gz
rsyslog-4fd98529572b57f494597a34f04ced96ef1031a2.tar.xz
rsyslog-4fd98529572b57f494597a34f04ced96ef1031a2.zip
Merge branch 'beta'
Conflicts: ChangeLog conf.c doc/Makefile.am doc/manual.html omfwd.c plugins/omgssapi/omgssapi.c This was a bit hard to merge; if there are problems, they may be in the area of the new "comment in action line" code that came from the beta.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog7
1 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 115f8282..11fe3b7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -118,6 +118,11 @@ Version 3.19.0 (rgerhards), 2008-05-06
- a lot of cleanup in regard to modularization
- -c option no longer must be the first option - thanks to varmjofekoj
for the patch
+Version 3.17.5 (rgerhards), 2008-06-27
+- added doc: howto set up a reliable connection to remote server via
+ queued mode (and plain tcp protocol)
+- bugfix: comments after actions were not properly treated. For some
+ actions (e.g. forwarding), this could also lead to invalid configuration
---------------------------------------------------------------------------
Version 3.17.4 (rgerhards), 2008-06-16
- changed default for $KlogSymbolLookup to "off". The directive is
@@ -184,7 +189,7 @@ Version 3.17.0 (rgerhards), 2008-04-08
Plus a number of bugfixes that were applied to v3-stable and beta
branches (not mentioned here in detail).
---------------------------------------------------------------------------
-Version 3.16.2 (rgerhards), 2008-05-14
+Version 3.16.2 (rgerhards), 2008-06-25
- fixed potential segfault due to invalid call to cfsysline
thanks to varmojfekoj for the patch
- bugfix: some whitespaces where incorrectly not ignored when parsing