summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-07-25 13:51:46 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-07-25 13:51:46 +0200
commitb829284f37add946ac810b125e3bededa1206c96 (patch)
tree823089ac6fcd92ef11957ac89d9ccfc998fd768a /ChangeLog
parentd45a286f2dee3c3d5aefef1ac16a02578c95f574 (diff)
parente39f202c75af187f96a1af07e60892a63e45cd3f (diff)
downloadrsyslog-b829284f37add946ac810b125e3bededa1206c96.tar.gz
rsyslog-b829284f37add946ac810b125e3bededa1206c96.tar.xz
rsyslog-b829284f37add946ac810b125e3bededa1206c96.zip
Merge branch 'v3-stable' into beta
Conflicts: ChangeLog configure.ac doc/manual.html
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fb88920b..da102b14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -157,7 +157,9 @@ 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.18.1 (rgerhards), 2008-07-??
+Version 3.18.2 (rgerhards), 2008-07-??
+---------------------------------------------------------------------------
+Version 3.18.1 (rgerhards), 2008-07-21
- bugfix: potential segfault in creating message mutex in non-direct queue
mode. rsyslogd segfaults on freeeBSD 7.0 (an potentially other platforms)
if an action queue is running in any other mode than non-direct. The
@@ -197,6 +199,7 @@ Version 3.18.1 (rgerhards), 2008-07-??
secpath-drop were not documented
- doc bugfix: fixed some typos in rsyslog.conf man page
- fixed typo in source comment - thanks to Rio Fujita
+- some general cleanup (thanks to Michael Biebl)
---------------------------------------------------------------------------
Version 3.18.0 (rgerhards), 2008-07-11
- begun a new v3-stable based on former 3.17.4 beta plus patches to