summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-06-22 10:27:20 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-06-22 10:27:20 +0200
commit44609ec259fdd321520111049ace194a0941a157 (patch)
tree571bb9e5ed6ec432a91b5f6ef66e464259cdf68c
parentb71ef4abad365f95cf7adf3df14083940d531f1f (diff)
downloadrsyslog-6.1.10.zip
rsyslog-6.1.10.tar.gz
rsyslog-6.1.10.tar.xz
prepare for 6.1.10v6.1.10
-rw-r--r--ChangeLog12
-rw-r--r--configure.ac2
-rw-r--r--doc/manual.html2
3 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 452ecba..82574cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,16 @@
---------------------------------------------------------------------------
+Version 6.1.10 [BETA] (rgerhards), 2011-06-22
+- bugfix: problems in failover action handling
+ closes: http://bugzilla.adiscon.com/show_bug.cgi?id=270
+ closes: http://bugzilla.adiscon.com/show_bug.cgi?id=254
+- bugfix: mutex was invalidly left unlocked during action processing
+ At least one case where this can occur is during thread shutdown, which
+ may be initiated by lower activity. In most cases, this is quite
+ unlikely to happen. However, if it does, data structures may be
+ corrupted which could lead to fatal failure and segfault. I detected
+ this via a testbench test, not a user report. But I assume that some
+ users may have had unreproducable aborts that were cause by this bug.
+---------------------------------------------------------------------------
Version 6.1.9 [BETA] (rgerhards), 2011-06-14
- bugfix: problems in failover action handling
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=270
diff --git a/configure.ac b/configure.ac
index a7c7cf4..4cf83c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
-AC_INIT([rsyslog],[6.1.9],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[6.1.10],[rsyslog@lists.adiscon.com])
AM_INIT_AUTOMAKE
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff --git a/doc/manual.html b/doc/manual.html
index 6a2a401..6dc025e 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -19,7 +19,7 @@ rsyslog support</a> available directly from the source!</p>
<p><b>Please visit the <a href="http://www.rsyslog.com/sponsors">rsyslog sponsor's page</a>
to honor the project sponsors or become one yourself!</b> We are very grateful for any help towards the
project goals.</p>
-<p><b>This documentation is for version 6.1.9 (devel branch) of rsyslog.</b>
+<p><b>This documentation is for version 6.1.10 (beta branch) of rsyslog.</b>
Visit the <i><a href="http://www.rsyslog.com/status">rsyslog status page</a></i></b>
to obtain current version information and project status.
</p><p><b>If you like rsyslog, you might