summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-02-24 10:22:54 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-02-24 10:22:54 +0100
commit8e027749b9f95a84619568c42d47c5dc78cf5b6a (patch)
tree2d541b8590757e7b3405ec8487c05fd7a26b3545
parent605701700a8914ebaff283193756a6e57d7d575b (diff)
downloadrsyslog-8e027749b9f95a84619568c42d47c5dc78cf5b6a.tar.gz
rsyslog-8e027749b9f95a84619568c42d47c5dc78cf5b6a.tar.xz
rsyslog-8e027749b9f95a84619568c42d47c5dc78cf5b6a.zip
preparing for 4.6.0 releasev4.6.0
-rw-r--r--ChangeLog9
-rw-r--r--configure.ac2
-rw-r--r--doc/manual.html2
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</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 4.5.8 (v4-beta branch) of rsyslog.</b>
+<p><b>This documentation is for version 4.6.0 (v4-stable branch) of rsyslog.</b>
Visit the <i><a href="http://www.rsyslog.com/doc-status.html">rsyslog status page</a></i></b>
to obtain current version information and project status.
</p><p><b>If you like rsyslog, you might