summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-08-05 14:09:06 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2010-08-05 14:09:06 +0200
commit1be79730693be187e99319377cf110fba41cc801 (patch)
treec09a297ad5e384ccd92d435b13c8a5c2fc11f110 /ChangeLog
parentae2d1c6fcb25867f2c6aa8e342a24afb43442e6a (diff)
parent318adf58de35d7b8c6ca891b93c351220628586b (diff)
downloadrsyslog-1be79730693be187e99319377cf110fba41cc801.tar.gz
rsyslog-1be79730693be187e99319377cf110fba41cc801.tar.xz
rsyslog-1be79730693be187e99319377cf110fba41cc801.zip
Merge branch 'v4-stable' into v4-devel
Conflicts: ChangeLog configure.ac doc/manual.html
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 2 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f4fdb0a5..df0e77f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,7 +45,7 @@ Version 4.7.0 [v4-devel] (rgerhards), 2010-04-14
(bugs require certain non-standard settings to appear)
Thanks to varmojfekoj for the patch [imported from 4.5.8]
---------------------------------------------------------------------------
-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
@@ -672,7 +672,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