diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-21 04:18:51 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-21 04:18:51 +0200 |
| commit | 715b9fe052f5a7c622a1f71f905461e06e398de8 (patch) | |
| tree | 033f0137a1b05be06cee467074f8a594915082f6 | |
| parent | ac32d356b5b776e0ca549d5c689a8932af4c2171 (diff) | |
| download | rsyslog-715b9fe052f5a7c622a1f71f905461e06e398de8.tar.gz rsyslog-715b9fe052f5a7c622a1f71f905461e06e398de8.tar.xz rsyslog-715b9fe052f5a7c622a1f71f905461e06e398de8.zip | |
preparing for 6.1.8 releasev6.1.8
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/manual.html | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 6 |
5 files changed, 15 insertions, 2 deletions
@@ -1,4 +1,10 @@ --------------------------------------------------------------------------- +Version 6.1.8 [BETA] (rgerhards), 2011-05-20 +- official new beta version (note that in a sense 6.1.7 was already beta, + so we may release the first stable v6 earlier than usual) +- new module mmsnmptrapd, a sample message modification module +- import of minor bug fixes from v4 & v5 +--------------------------------------------------------------------------- Version 6.1.7 [DEVEL] (rgerhards), 2011-04-15 - added log classification capabilities (via mmnormalize & tags) - speeded up tcp forwarding by reducing number of API calls diff --git a/Makefile.am b/Makefile.am index 037ad88c..d689b9ee 100644 --- a/Makefile.am +++ b/Makefile.am @@ -224,6 +224,7 @@ SUBDIRS += tests # in a make distcheck is so that we detect code that accidently was not updated # when some global update happened. DISTCHECK_CONFIGURE_FLAGS= --enable-gssapi_krb5 \ + --enable-gnutls \ --enable-imfile \ --enable-snmp \ --enable-pgsql \ diff --git a/configure.ac b/configure.ac index 5d00737f..f6a09fa7 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.1.7],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[6.1.8],[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 c725a412..798680ba 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.1.7 (devel branch) of rsyslog.</b> +<p><b>This documentation is for version 6.1.8 (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 diff --git a/tests/Makefile.am b/tests/Makefile.am index c3dfac55..6272c0dd 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -155,6 +155,12 @@ test_files = testbench.h runtime-dummy.c EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ validation-run.sh \ + testsuites/x.509/ca.pem \ + testsuites/x.509/ca-key.pem \ + testsuites/x.509/client-cert.pem \ + testsuites/x.509/client-key.pem \ + testsuites/x.509/machine-cert.pem \ + testsuites/x.509/machine-key.pem \ testsuites/invalid.conf \ testsuites/valid.conf \ cfg.sh \ |