summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-04-07 15:42:46 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-04-07 15:42:46 +0200
commitd6da57ae0370aeb705f63fd04e575b5ed4684618 (patch)
treed451907714559f5df60eb0cdef6ccbc205c812e4 /ChangeLog
parentd8ce489bae3ae072a2ee605cd90fa0530c9f3446 (diff)
parentbd8d972a975ce794dd71c1c8db724991dd4744a0 (diff)
downloadrsyslog-d6da57ae0370aeb705f63fd04e575b5ed4684618.tar.gz
rsyslog-d6da57ae0370aeb705f63fd04e575b5ed4684618.tar.xz
rsyslog-d6da57ae0370aeb705f63fd04e575b5ed4684618.zip
Merge branch 'v5-stable-newstats'
Conflicts: action.c configure.ac doc/imuxsock.html plugins/imklog/imklog.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c runtime/glbl.c runtime/glbl.h runtime/net.c runtime/ruleset.c tcpsrv.h tools/syslogd.c
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog8
1 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d6ef171d..a0b560e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+- added configuration directive to disable octet-counted framing
+ for imtcp, directive is $InputTCPServerSupportOctetCountedFraming
+ for imptcp, directive is $InputPTCPServerSupportOctetCountedFraming
+- added capability to use a local interface IP address as fromhost-ip for
+ locally originating messages. New directive $LocalHostIPIF
+- added configuration directives to customize queue light delay marks
+ $MainMsgQueueLightDelayMark, $ActionQueueLightDelayMark; both
+ specify number of messages starting at which a delay happens.
---------------------------------------------------------------------------
Version 6.3.8 [DEVEL] 2012-02-??
- added $PStatJSON directive to permit stats records in JSON format