diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-21 10:33:12 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-21 10:33:12 +0200 |
| commit | 8624f937523c1ca78cc1d78b8eba18f628ae9ab5 (patch) | |
| tree | 7e71ba0589075d3df7c708556d459879d1471cb5 | |
| parent | 191c51187ee54201954e5c73492a8bd5902044c7 (diff) | |
| parent | bd7542b51593739893922e8ec8fb6d7195d06cbe (diff) | |
| download | rsyslog-8624f937523c1ca78cc1d78b8eba18f628ae9ab5.tar.gz rsyslog-8624f937523c1ca78cc1d78b8eba18f628ae9ab5.tar.xz rsyslog-8624f937523c1ca78cc1d78b8eba18f628ae9ab5.zip | |
Merge branch 'v4-stable' into v4-beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
| -rw-r--r-- | ChangeLog | 16 |
1 files changed, 10 insertions, 6 deletions
@@ -58,13 +58,14 @@ Version 4.5.0 [DEVEL] (rgerhards), 2009-07-02 This could lead to timestamps written in the wrong format, but not to an abort --------------------------------------------------------------------------- -Version 4.3.3 [beta] (rgerhards), 2009-0?-?? -- internal bugfix: object pointer was only reset to NULL when an object - was actually destructed. This most likely had no effect to existing code, - but it may also have caused trouble in remote cases. Similarly, the fix - may also cause trouble... +Version 4.4.0 [v4-stable] (rgerhards), 2009-08-21 +- bugfix: stderr/stdout were not closed to be able to emit error messages, + but this caused ssh sessions to hang. Now we close them after the + initial initialization. See forum thread: + http://kb.monitorware.com/controlling-terminal-issues-t9875.html +- bugfix: sending syslog messages with zip compression did not work --------------------------------------------------------------------------- -Version 4.3.2 [beta] (rgerhards), 2009-06-24 +Version 4.3.2 [v4-beta] (rgerhards), 2009-06-24 - removed long-obsoleted property UxTradMsg - added a generic network stream server (in addition to rather specific syslog tcp server) @@ -118,12 +119,15 @@ Version 4.3.0 [DEVEL] (rgerhards), 2009-04-17 connection broke, but not if there was a problem with statement execution. The most probable case for such a case would be invalid sql inside the template, and this is now much easier to diagnose. +<<<<<<< HEAD:ChangeLog --------------------------------------------------------------------------- Version 4.2.1 [v4-stable] (rgerhards), 2009-0?-?? - bugfix: stderr/stdout were not closed to be able to emit error messages, but this caused ssh sessions to hang. Now we close them after the initial initialization. See forum thread: http://kb.monitorware.com/controlling-terminal-issues-t9875.html +======= +>>>>>>> bd7542b51593739893922e8ec8fb6d7195d06cbe:ChangeLog --------------------------------------------------------------------------- Version 4.2.0 [v4-stable] (rgerhards), 2009-06-23 - bugfix: light and full delay watermarks had invalid values, badly |