summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-05-22 17:23:08 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-05-22 17:23:08 +0200
commit0fa5486a4ace7a9be82b37979cf4693aff237340 (patch)
tree6c1b10bca2629acc171c1bb8719ef9fe6202a5c0 /ChangeLog
parent737614054caadf8340b638b368d43f55b7bb3741 (diff)
parentaba90e82484118f3568ec51c01de5ba845da589a (diff)
downloadrsyslog-0fa5486a4ace7a9be82b37979cf4693aff237340.tar.gz
rsyslog-0fa5486a4ace7a9be82b37979cf4693aff237340.tar.xz
rsyslog-0fa5486a4ace7a9be82b37979cf4693aff237340.zip
Merge branch 'master' into ultra-reliable
Conflicts: runtime/rsyslog.h tests/Makefile.am tools/syslogd.c
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog1
1 files changed, 1 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c71ae8be..2a1eb658 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
output module interface
---------------------------------------------------------------------------
Version 4.3.1 [DEVEL] (rgerhards), 2009-04-??
+- added capability to run multiple tcp listeners (on different ports)
- performance enhancement: imtcp calls parser no longer on input thread
but rather inside on of the potentially many main msg queue worker
threads (an enhancement scheduled for all input plugins where this is