summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-08-05 14:10:45 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2010-08-05 14:10:45 +0200
commit1b1b6b85e66281939a31685254565845d8d192a0 (patch)
tree0e5af6c9cc1b3b6da8135f509ce0b8a0f0390c7d /ChangeLog
parentebba229db9d89e69b60e542e3c49f25ed9ebc6fc (diff)
parent1be79730693be187e99319377cf110fba41cc801 (diff)
downloadrsyslog-1b1b6b85e66281939a31685254565845d8d192a0.tar.gz
rsyslog-1b1b6b85e66281939a31685254565845d8d192a0.tar.xz
rsyslog-1b1b6b85e66281939a31685254565845d8d192a0.zip
Merge branch 'v4-devel'
Conflicts: doc/Makefile.am doc/manual.html doc/professional_support.html
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 2 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0e820730..7ad51197 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -511,7 +511,7 @@ Version 4.7.0 [v4-devel] (rgerhards), 2010-04-14
Thanks for varmojfekoj for pointing me at this bug.
- imported changes from 4.5.6 and below
---------------------------------------------------------------------------
-Version 4.6.4 [v4-stable] (rgerhards), 2010-??-??
+Version 4.6.4 [v4-stable] (rgerhards), 2010-08-05
- bugfix: zero-sized (empty) messages were processed by imtcp
they are now dropped as they always should have been
- bugfix: programname filter in ! configuration can not be reset
@@ -1137,7 +1137,7 @@ version before switching to this one.
- bugfix: memory leak in ompgsql
Thanks to Ken for providing the patch
---------------------------------------------------------------------------
-Version 3.22.2 [v3-stable] (rgerhards), 2009-07-??
+Version 3.22.2 [v3-stable] (rgerhards), 2010-08-05
- bugfix: comment char ('#') in literal terminated script parsing
and thus could not be used.
but tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=119