summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-07-13 15:55:46 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-07-13 15:55:46 +0200
commitfec2041e037426ac227ee619b59629e059099d05 (patch)
treeaf59860c7b037b2ca0d7ce85a2384ab1b5ca3e04 /ChangeLog
parent6511278082a7e1e9602385cd24cdb5e363cb702f (diff)
parentef9722ec87c8a7ddb2d499c1e7863475d8790a94 (diff)
downloadrsyslog-fec2041e037426ac227ee619b59629e059099d05.tar.gz
rsyslog-fec2041e037426ac227ee619b59629e059099d05.tar.xz
rsyslog-fec2041e037426ac227ee619b59629e059099d05.zip
Merge branch 'v3-stable' into v4-stable
Conflicts: ChangeLog configure.ac doc/manual.html
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 66836317..f5905afd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ Version 4.2.1 [v4-stable] (rgerhards), 2009-0?-??
but this caused ssh sessions to hang. Now we close them after the
initial initialization. See forum thread:
http://kb.monitorware.com/controlling-terminal-issues-t9875.html
+- bugfix: sending syslog messages with zip compression did not work
---------------------------------------------------------------------------
Version 4.2.0 [v4-stable] (rgerhards), 2009-06-23
- bugfix: light and full delay watermarks had invalid values, badly
@@ -159,7 +160,10 @@ version before switching to this one.
- bugfix: memory leak in ompgsql
Thanks to Ken for providing the patch
---------------------------------------------------------------------------
-Version 3.22.1 [v3-stable] (rgerhards), 2009-04-??
+Version 3.22.2 [v3-stable] (rgerhards), 2009-07-??
+- bugfix: sending syslog messages with zip compression did not work
+---------------------------------------------------------------------------
+Version 3.22.1 [v3-stable] (rgerhards), 2009-07-02
- bugfix: invalid error message issued if $inlcudeConfig was on an empty
set of files (e.g. *.conf, where none such files existed)
thanks to Michael Biebl for reporting this bug