summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
1 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a7a06dbe..fe272c7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
- 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
@@ -552,11 +555,10 @@ expected that interfaces, even new ones, break during the initial
- added imptcp, a simplified, Linux-specific and potentielly fast
syslog plain tcp input plugin (NOT supporting TLS!)
[ported from v4]
-=======
+---------------------------------------------------------------------------
Version 5.10.1 [V5-STABLE], 2012-0?-??
- bugfix: remove invalid socket option call from imuxsock
Thanks to Cristian Ionescu-Idbohrn and Jonny Törnbom
->>>>>>> 2d538f14e2bae1407a3fb22c4a5244247dda1e4b
---------------------------------------------------------------------------
Version 5.10.0 [V5-STABLE], 2012-08-23