summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-03-04 11:42:21 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-03-04 11:42:21 +0100
commit0b84d47f7a244c25f63fadcec92d12ebfbe319a4 (patch)
tree7b6a7a2908213b66208012caae43dacb22c7b643
parent4c060687cf877e4c7faee02f33c219e5f6c8f8f6 (diff)
downloadrsyslog-0b84d47f7a244c25f63fadcec92d12ebfbe319a4.tar.gz
rsyslog-0b84d47f7a244c25f63fadcec92d12ebfbe319a4.tar.xz
rsyslog-0b84d47f7a244c25f63fadcec92d12ebfbe319a4.zip
prepared 4.6.1v4.6.1
-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 caaa8a11..2cf5f024 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
---------------------------------------------------------------------------
-Version 4.6.1 [v4-stable] (rgerhards), 2010-02-??
+Version 4.6.1 [v4-stable] (rgerhards), 2010-03-04
- re-enabled old pipe output (using new module ompipe, built-in) after
some problems with pipes (and especially in regard to xconsole) were
discovered. Thanks to Michael Biebl for reporting the issues.
diff --git a/configure.ac b/configure.ac
index d229915e..b059fe75 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],[4.6.0],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[4.6.1],[rsyslog@lists.adiscon.com])
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([ChangeLog])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/doc/manual.html b/doc/manual.html
index 0e121edf..0efe5076 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 4.6.0 (v4-stable branch) of rsyslog.</b>
+<p><b>This documentation is for version 4.6.1 (v4-stable branch) of rsyslog.</b>
Visit the <i><a href="http://www.rsyslog.com/doc-status.html">rsyslog status page</a></i></b>
to obtain current version information and project status.
</p><p><b>If you like rsyslog, you might