summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-10-02 17:59:59 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-10-02 17:59:59 +0200
commitdf90450d962b79fb59897fd9d2bd21292277256e (patch)
treeab1477ae302fd9ac0d8ad426fca8d9dbe9246f81
parent72930188588e54474298d464b943868f60300d7c (diff)
downloadrsyslog-df90450d962b79fb59897fd9d2bd21292277256e.tar.gz
rsyslog-df90450d962b79fb59897fd9d2bd21292277256e.tar.xz
rsyslog-df90450d962b79fb59897fd9d2bd21292277256e.zip
prepare for 7.1.8 release
-rw-r--r--ChangeLog8
-rw-r--r--configure.ac2
-rw-r--r--doc/manual.html2
3 files changed, 6 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 5b5480b1..da4d3212 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,12 @@
---------------------------------------------------------------------------
-Version 7.1.8 [devel] 2012-10-??
+Version 7.1.8 [beta] 2012-10-02
+- bugfix: ruleset(){} directive errornously changed default ruleset
+ much like the $ruleset legacy conf statement. This potentially lead
+ to statements being assigned to the wrong ruleset.
- improved module doc
- added "parser" parameter to ruleset(), so that parser chain can be
configured
- implemented "continue" RainerScript statement
-- bugfix: ruleset(){} directive errornously changed default ruleset
- much like the $ruleset legacy conf statement. This potentially lead
- to statements being assigned to the wrong ruleset.
---------------------------------------------------------------------------
Version 7.1.7 [devel] 2012-10-01
- implemented RainerScript "call" statement
diff --git a/configure.ac b/configure.ac
index 0eaed1bc..0aa51da0 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],[7.1.7],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[7.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 e2e064af..60704aff 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 7.1.7 (devel branch) of rsyslog.</b>
+<p><b>This documentation is for version 7.1.8 (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