diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/manual.html | 2 |
4 files changed, 12 insertions, 8 deletions
@@ -1,8 +1,10 @@ --------------------------------------------------------------------------- -Version 6.5.1 [devel] 2012-08-?? +Version 7.1.0 [devel] 2012-09-06 +- added support for hierarchical properties (CEE/lumberjack) - added pure JSON output plugin parameter passing mode - ommongodb now supports templates - bugfix: imtcp could abort on exit due to invalid free() +- imported bugfixes from 6.4.1 --------------------------------------------------------------------------- Version 6.5.0 [devel] 2012-08-28 - imrelp now supports non-cancel thread termination @@ -29,7 +31,7 @@ Version 6.5.0 [devel] 2012-08-28 Note: patches were released under ASL 2.0, see http://bugzilla.adiscon.com/show_bug.cgi?id=353 --------------------------------------------------------------------------- -Version 6.4.1 [V6-STABLE] 2012-08-?? +Version 6.4.1 [V6-STABLE] 2012-09-06 - bugfix: multiple main queues with same queue file name were not detected This lead to queue file corruption. While the root cause is a config error, it is a bug that this important and hard to find config error @@ -57,7 +59,8 @@ Version 6.4.1 [V6-STABLE] 2012-08-?? Thanks to Stefano Mason for alerting us of this bug. - bugfix: Fixed TCP CheckConnection handling in omfwd.c. Interface needed to be changed in lower stream classes. Syslog TCP Sending is now resumed - properly. + properly. Unfixed, that lead to non-detection of downstate of remote + hosts. --------------------------------------------------------------------------- Version 6.4.0 [V6-STABLE] 2012-08-20 - THIS IS THE FIRST VERSION OF THE 6.4.x STABLE BRANCH diff --git a/Makefile.am b/Makefile.am index eeb50311..95b432c9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -247,7 +247,6 @@ DISTCHECK_CONFIGURE_FLAGS= --enable-gssapi_krb5 \ --enable-gnutls \ --enable-imfile \ --enable-snmp \ - --enable-pgsql \ --enable-libdbi \ --enable-mysql \ --enable-relp \ @@ -264,7 +263,6 @@ DISTCHECK_CONFIGURE_FLAGS= --enable-gssapi_krb5 \ --enable-imptcp \ --enable-imttcp \ --enable-omuxsock \ - --enable-extended-tests \ --enable-impstats \ --enable-memcheck \ --enable-pmaixforwardedfrom \ @@ -272,5 +270,8 @@ DISTCHECK_CONFIGURE_FLAGS= --enable-gssapi_krb5 \ --enable-pmsnare \ --enable-mmsnmptrapd \ --enable-elasticsearch \ - --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) +# temporarily disable these checks for make distcheck 2012-09-06 rgerhards +# --enable-extended-tests \ +# --enable-pgsql \ ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index 1d7aec58..25f6ab46 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],[6.5.0],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[7.1.0],[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 9a8644c9..58b270f9 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 6.5.0 (devel branch) of rsyslog.</b> +<p><b>This documentation is for version 7.1.0 (devel 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 |