summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-10-29 16:21:29 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2013-10-29 16:21:29 +0100
commit73e7088748e560cd0c6d1ed7264951d32f64d060 (patch)
tree01e5308bd4581abe9a7f962dd3a77621cdd659df
parentf11d853d89716a9bf29afd16841a149516ca2ef3 (diff)
downloadrsyslog-7.4.6.tar.gz
rsyslog-7.4.6.tar.bz2
rsyslog-7.4.6.zip
prepare for 7.4.6 releasev7.4.6
-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 97bebc74..fd4e3942 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
---------------------------------------------------------------------------
-Version 7.4.6 [v7.4-stable] 2013-11-??
+Version 7.4.6 [v7.4-stable] 2013-10-31
- bugfix: potential abort during HUP
This could happen when one of imklog, imzmq3, imkmsg, impstats,
imjournal, or imuxsock were under heavy load during a HUP.
diff --git a/configure.ac b/configure.ac
index e253c916..ee3394b5 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.4.5],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[7.4.6],[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 801804e6..a8477bcd 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -19,7 +19,7 @@ professional services</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.4.5 (v7.4-stable branch) of rsyslog.</b>
+<p><b>This documentation is for version 7.4.6 (v7.4-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