summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-06-15 18:20:33 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-06-15 18:20:33 +0200
commitac272a5aeb44063f6fbfc8e30c6052166c185b24 (patch)
treea552f5a6b3bd7b7ffb127b6f65fa9e3f48c676ee /ChangeLog
parent46287fa5e8f2e961e9f9cb48df08d171ea510ec8 (diff)
parent6ce405a13e6d4722c33cd6dcce618ee3853df6a9 (diff)
downloadrsyslog-ac272a5aeb44063f6fbfc8e30c6052166c185b24.tar.gz
rsyslog-ac272a5aeb44063f6fbfc8e30c6052166c185b24.tar.xz
rsyslog-ac272a5aeb44063f6fbfc8e30c6052166c185b24.zip
Merge branch 'v6-stable' into beta
Conflicts: plugins/omudpspoof/omudpspoof.c tools/syslogd.c
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9b98adde..3950ab80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -681,6 +681,11 @@ Version 5.9.0 [V5-DEVEL] (rgerhards), 2011-06-08
Version 5.8.13 [V5-stable] 2012-06-??
- bugfix: "last message repeated n times" message was missing hostname
Thanks to Zdenek Salvet for finding this bug and to Bodik for reporting
+- bugfix "$PreserveFQDN on" was not honored in some modules
+ Thanks to bodik for reporting this bug.
+- bugfix: randomized IP option header in omudpspoof caused problems
+ closes: http://bugzilla.adiscon.com/show_bug.cgi?id=327
+ Thanks to Rick Brown for helping to test out the patch.
---------------------------------------------------------------------------
Version 5.8.12 [V5-stable] 2012-06-06
- add small delay (50ms) after sending shutdown message