summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-09-20 09:39:42 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-09-20 09:39:42 +0200
commite99ca8246fee02bb7f713f31527f2377a5d2dd5c (patch)
treeef00284af996f0951056dcf0610e987a80d1fd73
parent5cd44ee4383ec813b6d34783a6a2f62af2930ab6 (diff)
downloadrsyslog-e99ca8246fee02bb7f713f31527f2377a5d2dd5c.tar.gz
rsyslog-e99ca8246fee02bb7f713f31527f2377a5d2dd5c.tar.bz2
rsyslog-e99ca8246fee02bb7f713f31527f2377a5d2dd5c.zip
preparing for 6.4.2 releasev6.4.2
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac2
-rw-r--r--doc/manual.html2
-rw-r--r--plugins/cust1/cust1.c0
4 files changed, 3 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2823669f..fc6cfc68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
---------------------------------------------------------------------------
-Version 6.4.2 [V6-STABLE] 2012-09-??
+Version 6.4.2 [V6-STABLE] 2012-09-20
- bugfix: potential abort, if action queue could not be properly started
This most importantly could happen due to configuration errors.
- bugfix: remove invalid socket option call from imuxsock
diff --git a/configure.ac b/configure.ac
index 5d419b12..b57aabf0 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.4.1],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[6.4.2],[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 de0319f8..1114b9e2 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.4.1 (stable branch) of rsyslog.</b>
+<p><b>This documentation is for version 6.4.2 (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
diff --git a/plugins/cust1/cust1.c b/plugins/cust1/cust1.c
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/plugins/cust1/cust1.c