diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-24 10:11:41 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-24 10:11:41 +0200 |
| commit | eece1c3cd1c7379fbfabaa75444b0b5275a0886b (patch) | |
| tree | 1d30c62d0de633bab2531daec0638c791c2a146e | |
| parent | a48918cc2783f4351b246c97cd9669abb9d0de47 (diff) | |
| parent | 2d548d56c2cb5c4018994a9e3bae306bdf35f38f (diff) | |
| download | rsyslog-eece1c3cd1c7379fbfabaa75444b0b5275a0886b.tar.gz rsyslog-eece1c3cd1c7379fbfabaa75444b0b5275a0886b.tar.xz rsyslog-eece1c3cd1c7379fbfabaa75444b0b5275a0886b.zip | |
Merge branch 'v4-stable' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/manual.html | 2 |
3 files changed, 4 insertions, 3 deletions
@@ -54,9 +54,10 @@ Version 4.3.0 [DEVEL] (rgerhards), 2009-04-17 execution. The most probable case for such a case would be invalid sql inside the template, and this is now much easier to diagnose. --------------------------------------------------------------------------- -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 +- imported all patches from 3.22.1 as of today (see below) - bugfix: compile problems in im3195 --------------------------------------------------------------------------- Version 4.1.7 [BETA] (rgerhards), 2009-04-22 diff --git a/configure.ac b/configure.ac index 70eea038..1fd5c7a9 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.3.1],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[4.3.2],[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 adf89587..307f9a82 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.3.1 (devel branch) of rsyslog.</b> +<p><b>This documentation is for version 4.3.2 (beta 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 |