summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-05-02 12:40:48 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-05-02 12:40:48 +0200
commitbad4228f846d18bd721266931efbbf0b21375a92 (patch)
tree8d1a94582c8a16463f63bcb1f7be0c8db6174d07 /ChangeLog
parent434e404a6c7181a2b7efa9840506e8963665bdd6 (diff)
parent2493915cfedae899e66dbb3a2f139bf386fac5e1 (diff)
downloadrsyslog-bad4228f846d18bd721266931efbbf0b21375a92.tar.gz
rsyslog-bad4228f846d18bd721266931efbbf0b21375a92.tar.xz
rsyslog-bad4228f846d18bd721266931efbbf0b21375a92.zip
Merge branch 'beta'
Conflicts: plugins/imklog/linux.c runtime/cfsysline.c runtime/ctok.c runtime/linkedlist.c runtime/sysvar.c
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5bcc3d50..6f73db81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,7 @@ Version 3.19.0 (rgerhards), 2008-04-??
---------------------------------------------------------------------------
Version 3.17.2 (rgerhards), 2008-04-??
- this version is the new beta
+- merged in imklog bug fix from v3-stable (3.16.1)
---------------------------------------------------------------------------
Version 3.17.1 (rgerhards), 2008-04-15
- removed dependency on MAXHOSTNAMELEN as much as it made sense.
@@ -67,6 +68,11 @@ Version 3.17.0 (rgerhards), 2008-04-08
Plus a number of bugfixes that were applied to v3-stable and beta
branches (not mentioned here in detail).
---------------------------------------------------------------------------
+Version 3.16.1 (rgerhards), 2008-05-02
+- fixed a bug in imklog which lead to startup problems (including
+ segfault) on some platforms under some circumsances. Thanks to
+ Vieri for reporting this bug and helping to troubleshoot it.
+---------------------------------------------------------------------------
Version 3.16.0 (rgerhards), 2008-04-24
- new v3-stable (3.16.x) based on beta 3.15.x (RELP support)
- bugfix: omsnmp had a too-small sized buffer for hostname+port. This