diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-11-30 12:11:09 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-11-30 12:11:09 +0100 |
| commit | d1ccc0302653017782a59c3ff9e5f7e69811173e (patch) | |
| tree | 0b2de603f6a8182c73fab29d1d0c63e24b29197b | |
| parent | 786a44a0243cc6a5b0d47fb15f8f20a1a3f5bf0e (diff) | |
| parent | 1aac36dfd077073a76b80368f893810e1741a1ec (diff) | |
| download | rsyslog-d1ccc0302653017782a59c3ff9e5f7e69811173e.tar.gz rsyslog-d1ccc0302653017782a59c3ff9e5f7e69811173e.tar.xz rsyslog-d1ccc0302653017782a59c3ff9e5f7e69811173e.zip | |
Merge branch 'v5-devel'v6.1.1
Conflicts:
ChangeLog
configure.ac
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | doc/manual.html | 2 |
2 files changed, 11 insertions, 7 deletions
@@ -1,5 +1,9 @@ --------------------------------------------------------------------------- -Version 6.1.1 [DEVEL] (rgerhards), 2010-??-?? +Version 6.1.1 [DEVEL] (rgerhards), 2010-11-30 +- bugfix(important): problem in TLS handling could cause rsyslog to loop + in a tight loop, effectively disabling functionality and bearing the + risk of unresponsiveness of the whole system. + Bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=194 - support for omhdfs officially added (import from 5.7.1) - merged imuxsock improvements from 5.7.1 (see there) - support for systemd officially added (import from 5.7.0) @@ -8,10 +12,6 @@ Version 6.1.1 [DEVEL] (rgerhards), 2010-??-?? - bugfix: imfile utilizes 32 bit to track offset. Most importantly, this problem can not experienced on Fedora 64 bit OS (which has 64 bit long's!) -- bugfix(important): problem in TLS handling could cause rsyslog to loop - in a tight loop, effectively disabling functionality and bearing the - risk of unresponsiveness of the whole system. - Bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=194 - a number of other bugfixes from older versions imported --------------------------------------------------------------------------- Version 6.1.0 [DEVEL] (rgerhards), 2010-08-12 @@ -30,7 +30,11 @@ expected that interfaces, even new ones, break during the initial syslog plain tcp input plugin (NOT supporting TLS!) [ported from v4] --------------------------------------------------------------------------- -Version 5.7.2 [V5-DEVEL] (rgerhards), 2010-10-05 +Version 5.7.2 [V5-DEVEL] (rgerhards), 2010-11-26 +- bugfix(important): problem in TLS handling could cause rsyslog to loop + in a tight loop, effectively disabling functionality and bearing the + risk of unresponsiveness of the whole system. + Bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=194 - bugfix: imfile state file was not written when relative file name for it was specified - bugfix: compile failed on systems without epoll_create1() diff --git a/doc/manual.html b/doc/manual.html index 6affe746..ab1725fb 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 5.7.1 (beta branch) of rsyslog.</b> +<p><b>This documentation is for version 6.1.1 (beta branch) of rsyslog.</b> Visit the <i><a href="http://www.rsyslog.com/status">rsyslog status page</a></i></b> to obtain current version information and project status. </p><p><b>If you like rsyslog, you might |