summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-06-22 19:22:24 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-06-22 19:22:24 +0200
commit5310ccee3159c298cfd6e3af47c50d8b302894ec (patch)
tree968bf9eec2b791d0a067ddad9836993e4c5ea3ad
parent17133f2cd18a2b5376d40a01b87c970b3a47c265 (diff)
downloadrsyslog-5310ccee3159c298cfd6e3af47c50d8b302894ec.tar.gz
rsyslog-5310ccee3159c298cfd6e3af47c50d8b302894ec.tar.xz
rsyslog-5310ccee3159c298cfd6e3af47c50d8b302894ec.zip
preparing for v4-stable
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac2
-rw-r--r--doc/manual.html2
3 files changed, 3 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 697a6a3b..1da8a4ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
---------------------------------------------------------------------------
-Version 4.1.8 [BETA] (rgerhards), 2009-04-??
+Version 4.2.0 [v4-stable] (rgerhards), 2009-06-23
- bugfix: light and full delay watermarks had invalid values, badly
affecting performance for delayable inputs
- bugfix: compile problems in im3195
diff --git a/configure.ac b/configure.ac
index 4da2a4ff..3e24c62f 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.1.7],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[4.2.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 5b9c4b1e..a1657c05 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.1.7 (devel branch) of rsyslog.</b>
+<p><b>This documentation is for version 4.2.0 (v4-stable) 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