From 44609ec259fdd321520111049ace194a0941a157 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards
Date: Wed, 22 Jun 2011 10:27:20 +0200
Subject: prepare for 6.1.10
---
ChangeLog | 12 ++++++++++++
configure.ac | 2 +-
doc/manual.html | 2 +-
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 452ecba7..82574cff 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 a7c7cf42..4cf83c38 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 6a2a401d..6dc025ef 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -19,7 +19,7 @@ rsyslog support available directly from the source!
Please visit the rsyslog sponsor's page
to honor the project sponsors or become one yourself! We are very grateful for any help towards the
project goals.
-This documentation is for version 6.1.9 (devel branch) of rsyslog.
+
This documentation is for version 6.1.10 (beta branch) of rsyslog.
Visit the rsyslog status page
to obtain current version information and project status.
If you like rsyslog, you might
--
cgit