summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-01-30 13:52:49 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2009-01-30 13:52:49 +0100
commitb54797da054a74144f10dfeb0daeca99decd9b12 (patch)
tree99b173ac46ff792d7401d60a0e78846e4b4eda18 /ChangeLog
parent2cfaf5f86a4fb40cc37ae71118c506f1d924df13 (diff)
parenta2bfabc1c0cb1afd02d53ae731779486b566ddb6 (diff)
downloadrsyslog-b54797da054a74144f10dfeb0daeca99decd9b12.tar.gz
rsyslog-b54797da054a74144f10dfeb0daeca99decd9b12.tar.xz
rsyslog-b54797da054a74144f10dfeb0daeca99decd9b12.zip
Merge branch 'v3-stable' into beta, conclude fix for race
Conflicts: ChangeLog runtime/msg.c
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 99e50b8a..f7353cca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -146,6 +146,12 @@ Version 3.21.0 [DEVEL] (rgerhards), 2008-07-18
- imported all changes from 3.18.1 until today (some quite important,
see below)
---------------------------------------------------------------------------
+Version 3.20.4 [v3-stable] (rgerhards), 2009-02-??
+- bugfix: inconsistent use of mutex/atomic operations could cause segfault
+ details are too many, for full analysis see blog post at:
+ http://blog.gerhards.net/2009/01/rsyslog-data-race-analysis.html
+- bugfix: invalid mutex access in msg.c
+---------------------------------------------------------------------------
Version 3.20.3 [v3-stable] (rgerhards), 2009-01-19
- doc bugfix: v3-compatiblity document had typo in config directive
thanks to Andrej for reporting this