summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-01-18 14:51:33 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2012-01-18 14:51:33 +0100
commit03be2fcd7cfe3355b8108fe8368a6a65ab98e9e9 (patch)
tree5b56babfece1bc2f5e3ee6cbf030859b72232eca /ChangeLog
parentac9afc4149db314d9c480232d70216960342e3e4 (diff)
parentef34821a2737799f48c3032b9616418e4f7fa34f (diff)
downloadrsyslog-03be2fcd7cfe3355b8108fe8368a6a65ab98e9e9.tar.gz
rsyslog-03be2fcd7cfe3355b8108fe8368a6a65ab98e9e9.tar.xz
rsyslog-03be2fcd7cfe3355b8108fe8368a6a65ab98e9e9.zip
Merge branch 'v5-devel' into master
Conflicts: ChangeLog Makefile.am configure.ac doc/manual.html plugins/imptcp/imptcp.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c runtime/parser.c template.c tools/omfwd.c tools/syslogd.c
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog14
1 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index cb577101..540127aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -334,11 +334,19 @@ expected that interfaces, even new ones, break during the initial
syslog plain tcp input plugin (NOT supporting TLS!)
[ported from v4]
---------------------------------------------------------------------------
-Version 5.9.6 [V5-DEVEL], 20??-??-??
-- new stats counters "discarded.nf" and "discarded.full" for queue object.
- Tells how many messages have been discarded due to queue full condition.
+Version 5.9.6 [V5-DEVEL], 2012-??-??
+- $IMUXSockRateLimitInterval DEFAULT CHANGED, was 5, now 0
+ The new default turns off rate limiting. This was chosen as people
+ experienced problems with rate-limiting activated by default. Now it
+ needs an explicit opt-in by setting this parameter.
+ Thanks to Chris Gaffney for suggesting to make it opt-in; thanks to
+ many unnamed others who already had complained at the time Chris made
+ the suggestion ;-)
---------------------------------------------------------------------------
Version 5.9.5 [V5-DEVEL], 2011-11-29
+- new stats counters for imudp and imtcp
+- new stats counters "discarded.nf" and "discarded.full" for queue object.
+ Tells how many messages have been discarded due to queue full condition.
- enhanced module loader to not rely on PATH_MAX
---------------------------------------------------------------------------
Version 5.9.4 [V5-DEVEL], 2011-11-29