summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--doc/omuxsock.html2
2 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 43be22bd..c460a50d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/doc/omuxsock.html b/doc/omuxsock.html
index 4ffc53eb..5fa569eb 100644
--- a/doc/omuxsock.html
+++ b/doc/omuxsock.html
@@ -3,7 +3,7 @@
<a href="features.html">back</a>
</head>
<body>
-<h1>Mail Output Module (omuxsock)</h1>
+<h1>Unix sockets Output Module (omuxsock)</h1>
<p><b>Module Name:&nbsp;&nbsp;&nbsp; omuxsock</b></p>
<p><b>Available since:&nbsp;&nbsp;&nbsp;</b> 4.7.3, 5.5.7</p>
<p><b>Author: </b>Rainer Gerhards &lt;rgerhards@adiscon.com&gt;</p>