From a568626d4a627d226f203eb83f41b731e0f00ac9 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards
Date: Wed, 22 Aug 2012 18:54:13 +0200
Subject: preparing for 5.10.0 release
---
ChangeLog | 7 ++++++-
configure.ac | 2 +-
doc/manual.html | 2 +-
tests/Makefile.am | 4 +++-
4 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index fcb259b6..3073d2f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
---------------------------------------------------------------------------
-Version 5.10.0 [V5-STABLE], 2012-05-??
+Version 5.10.0 [V5-STABLE], 2012-08-23
+
+NOTE: this is the new rsyslog v5-stable, incorporating all changes from the
+ 5.9.x series. In addition to that, it contains the fixes and
+ enhancements listed below in this entry.
+
- bugfix: delayble source could block action queue, even if there was
a disk queue associated with it. The root cause of this problem was
that it makes no sense to delay messages once they arrive in the
diff --git a/configure.ac b/configure.ac
index 243cd6d8..cf8a205e 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.9.7],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[5.10.0],[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 e96dbe40..4250e2f0 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -19,7 +19,7 @@ rsyslog support available directly from the source!
Please visit the rsyslog sponsor's page
to honor the project sponsors or become one yourself! We are very grateful for any help towards the
project goals.
-This documentation is for version 5.9.7 (stable branch) of rsyslog.
+
This documentation is for version 5.10.0 (stable branch) of rsyslog.
Visit the rsyslog status page
to obtain current version information and project status.
If you like rsyslog, you might
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 77381d2f..110a6eaa 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -137,7 +137,9 @@ endif
endif
if ENABLE_EXTENDED_TESTS
-TESTS += random.sh
+# random.sh is temporarily disabled as it needs some work
+# to rsyslog core to complete in reasonable time
+#TESTS += random.sh
endif
if ENABLE_IMFILE
--
cgit