diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-09 10:54:58 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-09 10:54:58 +0200 |
| commit | 550afa1fefcf1c9a0d44c72c3f51fc15cd33df10 (patch) | |
| tree | 3cf5cab1e89a0a1db925c18f1ac0fa54a11b96cb /ChangeLog | |
| parent | b6884a3e1bd22eda94afae687a9a07378eac5318 (diff) | |
| parent | 89f7dddf36d57c9261464560e3b2c0fb8ea88fd2 (diff) | |
| download | rsyslog-550afa1fefcf1c9a0d44c72c3f51fc15cd33df10.tar.gz rsyslog-550afa1fefcf1c9a0d44c72c3f51fc15cd33df10.tar.xz rsyslog-550afa1fefcf1c9a0d44c72c3f51fc15cd33df10.zip | |
Merge branch 'v4-devel'
Conflicts:
runtime/rsyslog.h
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,11 +1,12 @@ --------------------------------------------------------------------------- -<<<<<<< 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 - doc bugfix: pmlastmsg doc samples had errors - bugfix[minor]: pmrfc3164sd had invalid name (resided in rsyslog name space, what should not be the case for a contributed module) +- added omuxsock, which permits to write message to local Unix sockets + this is the counterpart to imuxsock, enabling fast local forwarding --------------------------------------------------------------------------- Version 5.5.6 [DEVEL] (rgerhards), 2010-07-21 - added parser modules @@ -474,11 +475,10 @@ 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 |