From 8e027749b9f95a84619568c42d47c5dc78cf5b6a Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 24 Feb 2010 10:22:54 +0100 Subject: preparing for 4.6.0 release --- ChangeLog | 9 +++++++++ configure.ac | 2 +- doc/manual.html | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 99f45851..f1aaf75c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +--------------------------------------------------------------------------- +Version 4.6.0 [v4-beta] (rgerhards), 2010-02-24 +*************************************************************************** +* This is a new stable v4 version. It contains all fixes and enhancements * +* made during the 4.5.x phase as well as those listed below. * +* Note: this version is scheduled to conclude the v4 development process. * +* Do not expect any more new developments in v4. The focus is now * +* on v5 (what also means we have a single devel branch again. * +*************************************************************************** - improved testbench to contain samples for totally malformed messages which miss parts of the message content - bugfix: some malformed messages could lead to a missing LF inside files diff --git a/configure.ac b/configure.ac index fea6c0dd..7f8f38c3 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],[4.5.8],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[4.6.0],[rsyslog@lists.adiscon.com]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([ChangeLog]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/doc/manual.html b/doc/manual.html index 50dd5b0f..0e121edf 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 4.5.8 (v4-beta branch) of rsyslog. +

This documentation is for version 4.6.0 (v4-stable branch) of rsyslog. Visit the rsyslog status page to obtain current version information and project status.

If you like rsyslog, you might -- cgit v1.2.3 From 76ded5e98bd51d5de306f21f8abd28ee3b006be2 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 25 Feb 2010 10:09:47 +0100 Subject: doc bugfix: ChangeLog heading claimed that 4.6.0 was v4-beta while the rest of the entry correctly said it was stable. --- ChangeLog | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f1aaf75c..6a6ae5fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,15 @@ --------------------------------------------------------------------------- -Version 4.6.0 [v4-beta] (rgerhards), 2010-02-24 +Version 4.6.1 [v4-stable] (rgerhards), 2010-02-?? +--------------------------------------------------------------------------- +Version 4.6.0 [v4-stable] (rgerhards), 2010-02-24 *************************************************************************** * This is a new stable v4 version. It contains all fixes and enhancements * * made during the 4.5.x phase as well as those listed below. * * Note: this version is scheduled to conclude the v4 development process. * * Do not expect any more new developments in v4. The focus is now * -* on v5 (what also means we have a single devel branch again. * +* on v5 (what also means we have a single devel branch again). * +* ("development" means new feature development, bug fixes are of * +* course provided for v4-stable) * *************************************************************************** - improved testbench to contain samples for totally malformed messages which miss parts of the message content -- cgit v1.2.3