Merge branch 'v5-stable' into v6-stable

Conflicts:
	ChangeLog
	action.c
	configure.ac
	doc/manual.html
	runtime/ruleset.c
	template.h
	threads.c
	tools/syslogd.c

1 files changed, 23 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index b112a633..dd165e1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
 ---------------------------------------------------------------------------
+Version 6.4.1  [V6-STABLE] 2012-08-??
+- 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
+  error, it is a bug that this important and hard to find config error
+  was not detected by rsyslog.
+---------------------------------------------------------------------------
 Version 6.4.0  [V6-STABLE] 2012-08-20
 - THIS IS THE FIRST VERSION OF THE 6.4.x STABLE BRANCH
   It includes all enhancements made in 6.3.x plus what is written in the
@@ -521,7 +527,12 @@ expected that interfaces, even new ones, break during the initial
   syslog plain tcp input plugin (NOT supporting TLS!)
   [ported from v4]
 ---------------------------------------------------------------------------
-Version 5.9.8  [V5-BETA], 2012-05-??
+Version 5.10.0  [V5-STABLE], 2012-08-23
+
+NOTE: this is the new rsyslog v5-stable, incorporating all changes from the
+      5.9.x series. In addition to that, it contains the fixes and
+      enhancements listed below in this entry.
+
 - bugfix: delayble source could block action queue, even if there was
   a disk queue associated with it. The root cause of this problem was
   that it makes no sense to delay messages once they arrive in the 
@@ -550,6 +561,12 @@ Version 5.9.8  [V5-BETA], 2012-05-??
   If it is not present, it must have the nilvalue "-" as of RFC5424
   closes: http://bugzilla.adiscon.com/show_bug.cgi?id=332
   Thanks to John N for reporting this issue.
+- bugfix: "last message repeated n times" message was missing hostname
+  Thanks to Zdenek Salvet for finding this bug and to Bodik for reporting
+- bugfix: multiple main queues with same queue file name was not detected
+  This lead to queue file corruption. While the root cause is a config
+  error, it is a bug that this important and hard to find config error
+  was not detected by rsyslog.
 ---------------------------------------------------------------------------
 Version 5.9.7  [V5-BETA], 2012-05-10
 - added capability to specify substrings for field extraction mode
@@ -700,7 +717,7 @@ Version 5.9.0  [V5-DEVEL] (rgerhards), 2011-06-08
   affected directive was: $ActionExecOnlyWhenPreviousIsSuspended on
   closes: http://bugzilla.adiscon.com/show_bug.cgi?id=236
 ---------------------------------------------------------------------------
-Version 5.8.13  [V5-stable] 2012-06-??
+Version 5.8.13  [V5-stable] 2012-08-22
 - bugfix: DA queue could cause abort
 - bugfix: "last message repeated n times" message was missing hostname
   Thanks to Zdenek Salvet for finding this bug and to Bodik for reporting
@@ -714,6 +731,10 @@ Version 5.8.13  [V5-stable] 2012-06-??
   Thanks to bodik and Rohit Prasad for alerting us on this bug and
   analyzing it.
   fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=347
+- bugfix: multiple main queues with same queue file name was not detected
+  This lead to queue file corruption. While the root cause is a config
+  error, it is a bug that this important and hard to find config error
+  was not detected by rsyslog.
 ---------------------------------------------------------------------------
 Version 5.8.12  [V5-stable] 2012-06-06
 - add small delay (50ms) after sending shutdown message