summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-05-29 13:52:55 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-05-29 13:52:55 +0200
commit2ed8e41b31b4c7e20da487a0a8abc51cbabf70a6 (patch)
treeac069b67131b3e1f470cb983a32d0b2f54ca70bd /ChangeLog
parent8d8befaeca0d9ed3f096780e499a3231f16585c4 (diff)
parent43c45bfebcc672d6fbec2d4d659609d1ea48eda6 (diff)
downloadrsyslog-2ed8e41b31b4c7e20da487a0a8abc51cbabf70a6.tar.gz
rsyslog-2ed8e41b31b4c7e20da487a0a8abc51cbabf70a6.tar.xz
rsyslog-2ed8e41b31b4c7e20da487a0a8abc51cbabf70a6.zip
Merge branch 'v3-stable' into beta
Conflicts: ChangeLog
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 1 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 4be705ce..ef235247 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -152,7 +152,7 @@ version before switching to this one.
- bugfix: memory leak in ompgsql
Thanks to Ken for providing the patch
---------------------------------------------------------------------------
-Version 3.22.x [v3-stable] (rgerhards), 2009-04-??
+Version 3.22.1 [v3-stable] (rgerhards), 2009-04-??
- bugfix: internal messages were emitted to whatever file had fd2 when
rsyslogd ran in forked mode (as usual!)
Thanks to varmojfekoj for the patch
@@ -162,8 +162,6 @@ Version 3.22.x [v3-stable] (rgerhards), 2009-04-??
the change requires more code than I had hoped. Thus I have NOT tried
to actually catch all cases, this is left for the current devel
releases, if necessary]
----------------------------------------------------------------------------
-Version 3.22.1 [v3-stable] (rgerhards), 2009-04-??
- bugfix: light and full delay watermarks had invalid values, badly
affecting performance for delayable inputs
- bugfix: potential segfault issue when multiple $UDPServerRun directives