summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-02-24 14:52:49 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2009-02-24 14:52:49 +0100
commit924ceb305dc1dced54beaa6ffe4b72b9f2609c6a (patch)
tree1dd9c29e5bda8d7b6f4952827ffe9218bc060df4 /ChangeLog
parent46d7840b2500fd4cd3044ad06481f27ce97ee2ad (diff)
parent24a36fd14226ccf5f139c07252f05f3db124604e (diff)
downloadrsyslog-924ceb305dc1dced54beaa6ffe4b72b9f2609c6a.tar.gz
rsyslog-924ceb305dc1dced54beaa6ffe4b72b9f2609c6a.tar.xz
rsyslog-924ceb305dc1dced54beaa6ffe4b72b9f2609c6a.zip
Merge branch 'beta'
Conflicts: ChangeLog Makefile.am 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 02ef2eb7..ba2a6c13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -90,7 +90,10 @@ version before switching to this one.
- bugfix: memory leak in ompgsql
Thanks to Ken for providing the patch
---------------------------------------------------------------------------
-Version 3.21.10 [BETA] (rgerhards), 2008-12-??
+Version 3.21.11 [BETA] (rgerhards), 2009-0?-??
+- build system improvements contributed by Michael Biebl - thx!
+---------------------------------------------------------------------------
+Version 3.21.10 [BETA] (rgerhards), 2009-02-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