diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-06 17:32:29 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-06 17:32:29 +0200 |
| commit | 40e70777ea9e9d72b87a387ca3fe67ce45c3e00f (patch) | |
| tree | 88687f796b0efd4c2c61aaca4feb5977933f9f14 /ChangeLog | |
| parent | e4c926bfbca3aab3fe34fc9cfedb7343423de016 (diff) | |
| parent | 80ff634c841d692c1d9f335b88e225d6ce7317f7 (diff) | |
| download | rsyslog-40e70777ea9e9d72b87a387ca3fe67ce45c3e00f.tar.gz rsyslog-40e70777ea9e9d72b87a387ca3fe67ce45c3e00f.tar.xz rsyslog-40e70777ea9e9d72b87a387ca3fe67ce45c3e00f.zip | |
Merge branch 'v4-devel'
Conflicts:
ChangeLog
Makefile.am
configure.ac
doc/rsyslog_conf_modules.html
runtime/rsyslog.h
tests/Makefile.am
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -1,4 +1,5 @@ --------------------------------------------------------------------------- +<<<<<<< HEAD Version 5.5.7 [V5-BETA] (rgerhards), 2010-08-?? - changed omudpspoof default spoof address to simplify typical use case thanks to David Lang for suggesting this @@ -473,6 +474,11 @@ increase. superior performance (for databases potentially far superior performance) - increased ompgsql performance by adapting to new transactional output module interface +======= +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 +>>>>>>> 80ff634c841d692c1d9f335b88e225d6ce7317f7 --------------------------------------------------------------------------- Version 4.7.2 [v4-devel] (rgerhards), 2010-05-03 - bugfix: problems with atomic operations emulaton |