summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-11-18 10:55:17 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2009-11-18 10:55:17 +0100
commit903811a856109486ce238133fc8c68fa89f26514 (patch)
tree34ed0370ca046673b542277f3729287b7f0d5d9b
parent2a1d97263f639744b1caefe79ab60e4907e8ac41 (diff)
downloadrsyslog-4.5.7.zip
rsyslog-4.5.7.tar.gz
rsyslog-4.5.7.tar.xz
preparing for 4.5.7v4.5.7
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac2
-rw-r--r--doc/manual.html2
-rw-r--r--tests/Makefile.am1
-rwxr-xr-xtests/sndrcv_drvr.sh1
5 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0603a87..270f9bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
---------------------------------------------------------------------------
-Version 4.5.7 [v4-beta] (rgerhards), 2009-11-??
+Version 4.5.7 [v4-beta] (rgerhards), 2009-11-18
- added a so-called "On Demand Debug" mode, in which debug output can
be generated only after the process has started, but not right from
the beginning. This is assumed to be useful for hard-to-find bugs.
diff --git a/configure.ac b/configure.ac
index 39e78d2..9a637d4 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.5.6],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[4.5.7],[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 e6935d5..785845b 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.5.6 (v4-beta branch) of rsyslog.</b>
+<p><b>This documentation is for version 4.5.7 (v4-beta 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 a50ee8e..2026aec 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -111,6 +111,7 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \
omod-if-array.sh \
diag.sh \
testsuites/diag-common.conf \
+ testsuites/diag-common2.conf \
queue-persist.sh \
queue-persist-drvr.sh \
testsuites/queue-persist.conf \
diff --git a/tests/sndrcv_drvr.sh b/tests/sndrcv_drvr.sh
index 9835a8e..63afd6b 100755
--- a/tests/sndrcv_drvr.sh
+++ b/tests/sndrcv_drvr.sh
@@ -35,6 +35,7 @@ source $srcdir/diag.sh wait-startup 2
# now inject the messages into instance 2. It will connect to instance 1,
# and that instance will record the data.
source $srcdir/diag.sh tcpflood 127.0.0.1 13514 1 $2 1
+sleep 2 # make sure all data is received in input buffers
# shut down sender when everything is sent, receiver continues to run concurrently
# may be needed by TLS (once we do it): sleep 60
source $srcdir/diag.sh shutdown-when-empty 2