diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-31 11:07:22 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-31 11:07:22 +0100 |
| commit | 4ebd5779f63801dd15100b2567d1c057287bcf9c (patch) | |
| tree | 88731b3e85a4d8ae65493657593abab666dabeed | |
| parent | 462d416598ac32ffd244e888707aa890ba0eafae (diff) | |
| parent | 0732e088e985482c7f897c8fd571587fa808f6d0 (diff) | |
| download | rsyslog-4ebd5779f63801dd15100b2567d1c057287bcf9c.tar.gz rsyslog-4ebd5779f63801dd15100b2567d1c057287bcf9c.tar.bz2 rsyslog-4ebd5779f63801dd15100b2567d1c057287bcf9c.zip | |
Merge branch 'master' into master-ruleeng
| -rw-r--r-- | ChangeLog | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -38,6 +38,7 @@ Version 7.5.6 [devel] 2013-10-29 - bugfix: invalid property filter was not properly disabled in ruleset Note: the cosmetic memory leak introduced with that patch in 7.4.5 is now also fixed. +- imported bugfixes from 7.4.6 stable release --------------------------------------------------------------------------- Version 7.5.5 [devel] 2013-10-16 - imfile: permit to monitor an unlimited number of files @@ -193,7 +194,7 @@ Version 7.5.0 [devel] 2013-06-11 connections Thanks to Axel Rau for the patch. --------------------------------------------------------------------------- -Version 7.4.6 [v7.4-stable] 2013-11-?? +Version 7.4.6 [v7.4-stable] 2013-10-31 - bugfix: potential abort during HUP This could happen when one of imklog, imzmq3, imkmsg, impstats, imjournal, or imuxsock were under heavy load during a HUP. |