summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-08-11 12:49:16 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2010-08-11 12:49:16 +0200
commita77a99bfbf8505d05b08a981ab25d599af864ce5 (patch)
tree2445512303106459f455d359114c71c46ef87353 /ChangeLog
parentd3fe3b28aca6ffd616f55929af9f459585739a06 (diff)
parent32e715929f5d946d7244db3bc0595842dd293dd9 (diff)
downloadrsyslog-a77a99bfbf8505d05b08a981ab25d599af864ce5.tar.gz
rsyslog-a77a99bfbf8505d05b08a981ab25d599af864ce5.tar.xz
rsyslog-a77a99bfbf8505d05b08a981ab25d599af864ce5.zip
Merge branch 'v4-devel' into master
Conflicts: Makefile.am tests/tcpflood.c
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog2
1 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 36f16be2..9d01c1f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -479,6 +479,8 @@ increase.
Version 4.7.3 [v4-devel] (rgerhards), 2010-??-??
- added omuxsock, which permits to write message to local Unix sockets
this is the counterpart to imuxsock, enabling fast local forwarding
+- added imptcp, a simplified, Linux-specific and potentielly fast
+ syslog plain tcp input plugin (NOT supporting TLS!)
---------------------------------------------------------------------------
Version 4.7.2 [v4-devel] (rgerhards), 2010-05-03
- bugfix: problems with atomic operations emulaton