summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-08-11 11:49:32 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2010-08-11 11:49:32 +0200
commit32e715929f5d946d7244db3bc0595842dd293dd9 (patch)
tree2a154cd6984690e91569feebcd6924efa0eb91b7 /ChangeLog
parent89f7dddf36d57c9261464560e3b2c0fb8ea88fd2 (diff)
parentc664adfa1683763ae503f2da9e8d4d528d6634d1 (diff)
downloadrsyslog-32e715929f5d946d7244db3bc0595842dd293dd9.tar.gz
rsyslog-32e715929f5d946d7244db3bc0595842dd293dd9.tar.xz
rsyslog-32e715929f5d946d7244db3bc0595842dd293dd9.zip
Merge branch 'v4-stable-imptcp' into tmp
Conflicts: Makefile.am configure.ac runtime/rsyslog.h tests/Makefile.am
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog2
1 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d5e05a3..38d0595f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
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