summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-03-26 15:41:59 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-03-26 15:41:59 +0100
commitb6ce75cb6ce65a468f9551d98a641b407a4f2630 (patch)
tree7d43467741fe4f8a28839a6151e3e4b42035255c
parent77f4230c10f9f2a1c9605f0b4208d7209b2ccf27 (diff)
downloadrsyslog-4.6.2.zip
rsyslog-4.6.2.tar.gz
rsyslog-4.6.2.tar.xz
preparing for 4.6.2v4.6.2
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac2
-rw-r--r--doc/manual.html2
-rw-r--r--tests/Makefile.am3
4 files changed, 4 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 0eed1cf..66eb1e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
---------------------------------------------------------------------------
-Version 4.6.2 [v4-stable] (rgerhards), 2010-03-??
+Version 4.6.2 [v4-stable] (rgerhards), 2010-03-26
- new feature: "." action type added to support writing files to relative
pathes (this is primarily meant as a debug aid)
- new feature: $OMFileAsyncWriting directive added
diff --git a/configure.ac b/configure.ac
index b059fe7..b01396d 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.1],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[4.6.2],[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 0efe507..455a711 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.1 (v4-stable branch) of rsyslog.</b>
+<p><b>This documentation is for version 4.6.2 (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
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0b1ccb4..42ef32e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -54,7 +54,7 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \
testsuites/valid.conf \
cfg.sh \
cfg1.cfgtest \
- fg1.testin \
+ cfg1.testin \
cfg2.cfgtest \
cfg2.testin \
cfg3.cfgtest \
@@ -109,7 +109,6 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \
testsuites/parse3.conf \
testsuites/reallife.parse3 \
testsuites/parse-nodate.conf \
- testsuites/reallife.parse-nodate \
testsuites/parse_invld_regex.conf \
testsuites/samples.parse_invld_regex \
testsuites/parse-3164-buggyday.conf \