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 /ChangeLog | |
| 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
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 3 |
1 files changed, 2 insertions, 1 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 |