diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-26 12:22:31 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-26 12:22:31 +0200 |
| commit | c024a3784fbab28d724e038b784d3b72125848c4 (patch) | |
| tree | 58f82504e537af527716636b297b88187633af3a | |
| parent | d8ab04b533a6d2fc224e1931463b91508cc6d701 (diff) | |
| download | rsyslog-c024a3784fbab28d724e038b784d3b72125848c4.tar.gz rsyslog-c024a3784fbab28d724e038b784d3b72125848c4.tar.xz rsyslog-c024a3784fbab28d724e038b784d3b72125848c4.zip | |
very minor fix: removing invalid doc left-over from merge
| -rw-r--r-- | ChangeLog | 9 |
1 files changed, 0 insertions, 9 deletions
@@ -156,15 +156,6 @@ 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 |