summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-02-11 11:48:29 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2011-02-11 11:48:29 +0100
commitb941f68aaeec4bd458328e09121b623ac63f6dd6 (patch)
tree3bd6490dbcb77ad72bdb186a02f3bf297607964a /ChangeLog
parent819ac126e2cc85916bee32575c85b3c8d7317325 (diff)
parent2d67035d1b851bdfb430e6980ca217c1807b3a9c (diff)
downloadrsyslog-b941f68aaeec4bd458328e09121b623ac63f6dd6.tar.gz
rsyslog-b941f68aaeec4bd458328e09121b623ac63f6dd6.tar.xz
rsyslog-b941f68aaeec4bd458328e09121b623ac63f6dd6.zip
Merge branch 'v5-beta'
Conflicts: ChangeLog configure.ac doc/manual.html
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog11
1 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4e62100e..2d86a077 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -76,7 +76,16 @@ expected that interfaces, even new ones, break during the initial
syslog plain tcp input plugin (NOT supporting TLS!)
[ported from v4]
---------------------------------------------------------------------------
-Version 5.7.3 [V5-DEVEL] (rgerhards), 2010-12-??
+Version 5.7.4 [V5-BETA] (rgerhards), 2011-02-??
+- added pmsnare parser module (written by David Lang)
+- enhanced imfile to support non-cancel input termination
+- improved systemd socket activation thanks to Marius Tomaschweski
+- bugfix: pmsnare causded abort under some conditions
+- bugfix: abort if imfile reads file line of more than 64KiB
+ Thanks to Peter Eisentraut for reporting and analysing this problem.
+ bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=221
+---------------------------------------------------------------------------
+Version 5.7.3 [V5-BETA] (rgerhards), 2011-02-07
- added support for processing multi-line messages in imfile
- added $IMUDPSchedulingPolicy and $IMUDPSchedulingPriority config settings
- added $LocalHostName config directive