diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-24 18:08:14 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-24 18:08:14 +0100 |
| commit | 590252c2275da8d4ed777a3bb84a227327b3871a (patch) | |
| tree | 6c3ca921a3fa87add582317a92c270a30685d260 | |
| parent | b41fc354ede3baec9740cb7e6a2f609824269836 (diff) | |
| parent | b029d4751ac77f7ee4c7035c522e6c85601035c1 (diff) | |
| download | rsyslog-590252c2275da8d4ed777a3bb84a227327b3871a.tar.gz rsyslog-590252c2275da8d4ed777a3bb84a227327b3871a.tar.xz rsyslog-590252c2275da8d4ed777a3bb84a227327b3871a.zip | |
Merge branch 'v5-stable' into v5-stable-newstats
Conflicts:
configure.ac
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/manual.html | 2 |
4 files changed, 9 insertions, 3 deletions
@@ -1,5 +1,5 @@ --------------------------------------------------------------------------- -Version 5.8.7 [V5-stable] 2011-??-?? +Version 5.8.7 [V5-stable] 2012-01-17 - bugfix: instabilities when using RFC5424 header fields Thanks to Kaiwang Chen for the patch - bugfix: imuxsock did truncate part of received message if it did not @@ -10,6 +10,9 @@ Version 5.8.7 [V5-stable] 2011-??-?? closes: http://bugzilla.adiscon.com/show_bug.cgi?id=290 Thanks to Tomas Heinrich for the patch - bugfix: stats counter were not properly initialized on creation +- FQDN hostname for multihomed host was not always set to the correct name + if multiple aliases existed. Thanks to Tomas Heinreich for the patch. +- re-licensed larger parts of the codebase under the Apache license 2.0 --------------------------------------------------------------------------- Version 5.8.6 [V5-stable] 2011-10-21 - bugfix: missing whitespace after property-based filter was not detected @@ -865,6 +868,7 @@ Version 4.8.1 [v4-stable], 2011-09-?? - added doc for omprog - FQDN hostname for multihomed host was not always set to the correct name if multiple aliases existed. Thanks to Tomas Heinreich for the patch. +- re-licensed larger parts of the codebase under the Apache license 2.0 --------------------------------------------------------------------------- Version 4.8.0 [v4-stable] (rgerhards), 2011-09-07 *************************************************************************** diff --git a/Makefile.am b/Makefile.am index de4777b2..48eb26ce 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,7 +60,9 @@ EXTRA_DIST = \ slackware/rc.rsyslogd \ contrib/README \ rsyslog.conf \ + COPYING \ COPYING.LESSER \ + COPYING.ASL20 \ contrib/gnutls/ca.pem \ contrib/gnutls/cert.pem \ contrib/gnutls/key.pem \ diff --git a/configure.ac b/configure.ac index dd305221..0e9240e5 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([rsyslog],[5.8.6-newstats3],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[5.8.6-newstats5],[rsyslog@lists.adiscon.com]) AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff --git a/doc/manual.html b/doc/manual.html index 34de4b2b..010ccab6 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.8.6 (v5-stable branch) of rsyslog.</b> +<p><b>This documentation is for version 5.8.7 (v5-stable 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 |