diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-10 09:06:27 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-10 09:06:27 +0200 |
| commit | b3d54ce6ffa3925e4cf3ee3d4dfafdfeb552e6dd (patch) | |
| tree | 04f831a2b61338c6761c517d6c630ca9b9efb332 | |
| parent | 24a81f99508821b608c1dc9e3fee6c2ebbaed59d (diff) | |
| parent | 3118b8e100af413aaeaf88c2f96e2ad1c1a72191 (diff) | |
| download | rsyslog-b3d54ce6ffa3925e4cf3ee3d4dfafdfeb552e6dd.tar.gz rsyslog-b3d54ce6ffa3925e4cf3ee3d4dfafdfeb552e6dd.tar.xz rsyslog-b3d54ce6ffa3925e4cf3ee3d4dfafdfeb552e6dd.zip | |
Merge branch 'v5-beta' of git+ssh://git.adiscon.com/git/rsyslog into v5-beta
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/manual.html | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -1,5 +1,5 @@ --------------------------------------------------------------------------- -Version 5.9.7 [V5-BETA], 2012-04-?? +Version 5.9.7 [V5-BETA], 2012-05-10 - added capability to specify substrings for field extraction mode - bugfix: ommysql did not properly init/exit the mysql runtime library this could lead to segfaults. Triggering condition: multiple action diff --git a/configure.ac b/configure.ac index 60cc7674..243cd6d8 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.9.6],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[5.9.7],[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 55809f3e..e96dbe40 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.9.6 (stable branch) of rsyslog.</b> +<p><b>This documentation is for version 5.9.7 (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 |