rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-17 21:00:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

nit: correct messed-up ChangeLog

Browse Source
This commit is contained in:
Rainer Gerhards 2012-09-12 18:11:12 +02:00
parent 9aacbcb056
commit 4f0672f601
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,5 +1,8 @@
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
<<<<<<< HEAD Version 6.4.2 [V6-STABLE] 2012-09-??
- bugfix: remove invalid socket option call from imuxsock
Thanks to Cristian Ionescu-Idbohrn and Jonny Törnbom
---------------------------------------------------------------------------
Version 6.4.1 [V6-STABLE] 2012-09-06 Version 6.4.1 [V6-STABLE] 2012-09-06
- bugfix: multiple main queues with same queue file name were not detected - bugfix: multiple main queues with same queue file name were not detected
This lead to queue file corruption. While the root cause is a config This lead to queue file corruption. While the root cause is a config
@ -552,11 +555,10 @@ expected that interfaces, even new ones, break during the initial
- added imptcp, a simplified, Linux-specific and potentielly fast - added imptcp, a simplified, Linux-specific and potentielly fast
syslog plain tcp input plugin (NOT supporting TLS!) syslog plain tcp input plugin (NOT supporting TLS!)
[ported from v4] [ported from v4]
======= ---------------------------------------------------------------------------
Version 5.10.1 [V5-STABLE], 2012-0?-?? Version 5.10.1 [V5-STABLE], 2012-0?-??
- bugfix: remove invalid socket option call from imuxsock - bugfix: remove invalid socket option call from imuxsock
Thanks to Cristian Ionescu-Idbohrn and Jonny Törnbom Thanks to Cristian Ionescu-Idbohrn and Jonny Törnbom
>>>>>>> 2d538f14e2bae1407a3fb22c4a5244247dda1e4b
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
Version 5.10.0 [V5-STABLE], 2012-08-23 Version 5.10.0 [V5-STABLE], 2012-08-23