summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-03-09 10:01:19 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2011-03-09 10:01:19 +0100
commit67a52bbd1d236f2f24297efdbceaf20c6fa10906 (patch)
tree46d6d6694ae4aeb27915e32e07c105c05f6997e0
parent4b667744e7fde259a5a895a3b55baeec9139a6f1 (diff)
downloadrsyslog-5.7.8.tar.gz
rsyslog-5.7.8.tar.xz
rsyslog-5.7.8.zip
preparing for 5.7.8 releasev5.7.8
-rw-r--r--ChangeLog3
-rw-r--r--configure.ac2
-rw-r--r--doc/manual.html2
-rwxr-xr-xtests/imtcp_conndrop.sh2
4 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index c5058fbc..baf0bcfe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
---------------------------------------------------------------------------
-Version 5.7.8 [V5-BETA] (rgerhards), 2011-03-??
+Version 5.7.8 [V5-BETA] (rgerhards), 2011-03-09
+- systemd support somewhat improved (can now take over existing log sockt)
- bugfix: discard action did not work under some circumstances
fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=217
- bugfix: file descriptor leak in gnutls netstream driver
diff --git a/configure.ac b/configure.ac
index a7d26a1f..b5666d66 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],[5.7.7],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[5.7.8],[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 48ff5e16..945a5a62 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 5.7.7 (beta branch) of rsyslog.</b>
+<p><b>This documentation is for version 5.7.8 (beta 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/tests/imtcp_conndrop.sh b/tests/imtcp_conndrop.sh
index c7eb89e8..0bfcd99c 100755
--- a/tests/imtcp_conndrop.sh
+++ b/tests/imtcp_conndrop.sh
@@ -9,7 +9,7 @@ source $srcdir/diag.sh init
source $srcdir/diag.sh startup imtcp_conndrop.conf
# 100 byte messages to gain more practical data use
source $srcdir/diag.sh tcpflood -c20 -m50000 -r -d100 -P129 -D
-sleep 6 # due to large messages, we need this time for the tcp receiver to settle...
+sleep 10 # due to large messages, we need this time for the tcp receiver to settle...
source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages
source $srcdir/diag.sh wait-shutdown # and wait for it to terminate
source $srcdir/diag.sh seq-check 0 49999 -E