diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-26 17:00:12 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-26 17:00:12 +0100 |
| commit | 46ac70bb3073295f70bdddc8359d056bc0651909 (patch) | |
| tree | 98b42b96616bc087980b0ddff9609f9174599d9e | |
| parent | 3ab759c40d34f518744efa9b266640784fc3655f (diff) | |
| parent | b6ce75cb6ce65a468f9551d98a641b407a4f2630 (diff) | |
| download | rsyslog-46ac70bb3073295f70bdddc8359d056bc0651909.tar.gz rsyslog-46ac70bb3073295f70bdddc8359d056bc0651909.tar.xz rsyslog-46ac70bb3073295f70bdddc8359d056bc0651909.zip | |
Merge branch 'v4-stable' into v4-stable-solaris
Conflicts:
ChangeLog
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/manual.html | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 3 |
4 files changed, 4 insertions, 5 deletions
@@ -3,7 +3,7 @@ Version 4.6.3 [v4-stable] (rgerhards), 2010-03-?? - bugfix: local unix system log socket was deleted even when it was not configured --------------------------------------------------------------------------- -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) - added replacements for atomic instructions on systems that do not diff --git a/configure.ac b/configure.ac index 64f4fdc8..cd33201a 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 0efe5076..455a7116 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 41b13a18..7ca40766 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 \ |