summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-06-21 10:03:47 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-06-21 10:03:47 +0200
commitde33ec026e505658d613b372ea9d32656ebb86d8 (patch)
tree4bfbf59c383cc35a66f7662e9ef3185a57d6c549
parent9fcc6b7285c316b97d4178c9e264d6de432f88b6 (diff)
downloadrsyslog-de33ec026e505658d613b372ea9d32656ebb86d8.tar.gz
rsyslog-de33ec026e505658d613b372ea9d32656ebb86d8.tar.xz
rsyslog-de33ec026e505658d613b372ea9d32656ebb86d8.zip
preparing for 5.8.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, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 6cdfb670..9cef03e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
---------------------------------------------------------------------------
-Version 5.8.2 [V5-stable] (rgerhards), 2011-06-??
+Version 5.8.2 [V5-stable] (rgerhards), 2011-06-21
- bugfix: problems in failover action handling
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=270
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=254
diff --git a/configure.ac b/configure.ac
index 1faaff89..5873c661 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.8.1],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[5.8.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 5c656752..db9eb907 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.8.1 (stable branch) of rsyslog.</b>
+<p><b>This documentation is for version 5.8.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/tests/Makefile.am b/tests/Makefile.am
index eec7b16b..77381d2f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -101,7 +101,8 @@ endif
if ENABLE_GNUTLS
if HAVE_VALGRIND
-TESTS += manytcp-too-few-tls.sh
+# This test does not work on v5 as we keep DH params
+#TESTS += manytcp-too-few-tls.sh
endif
endif