summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-06-18 09:53:58 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-06-18 09:53:58 +0200
commita1ab5c0e7e7f8e9cf14ae26935e84719d0600fb8 (patch)
tree3e8cfc3278bae5b8f5d08eb7f48895d8bd1d17ed
parentac272a5aeb44063f6fbfc8e30c6052166c185b24 (diff)
downloadrsyslog-a1ab5c0e7e7f8e9cf14ae26935e84719d0600fb8.tar.gz
rsyslog-a1ab5c0e7e7f8e9cf14ae26935e84719d0600fb8.tar.xz
rsyslog-a1ab5c0e7e7f8e9cf14ae26935e84719d0600fb8.zip
preparing for 6.3.11v6.3.11
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac2
-rw-r--r--doc/manual.html2
3 files changed, 3 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 3950ab80..d43969d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
---------------------------------------------------------------------------
-Version 6.3.11 [BETA] 2012-06-??
+Version 6.3.11 [BETA] 2012-06-18
- bugfix: expression-based filters with AND/OR could segfault
due to a problem with boolean shortcut operations. From the user's
perspective, the segfault is almost non-deterministic (it occurs when
diff --git a/configure.ac b/configure.ac
index 498b59d8..540c731b 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.3.10],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[6.3.11],[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 7af5c5eb..1bc8f1f7 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.3.10 (beta branch) of rsyslog.</b>
+<p><b>This documentation is for version 6.3.11 (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