summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-05-20 15:40:45 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2010-05-20 15:40:45 +0200
commit128cf1b5e5738597288dd0120ced63a0334d4698 (patch)
tree0b5e42cdaa37137e0f97cee01057bbafa8dc1cee
parent7574e70df4c6796878d3b753275f01b5f0d65ade (diff)
downloadrsyslog-128cf1b5e5738597288dd0120ced63a0334d4698.tar.gz
rsyslog-128cf1b5e5738597288dd0120ced63a0334d4698.tar.xz
rsyslog-128cf1b5e5738597288dd0120ced63a0334d4698.zip
preparing for 5.5.5v5.5.5
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac2
-rw-r--r--doc/manual.html2
3 files changed, 3 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e8ceda4c..50175f7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
---------------------------------------------------------------------------
-Version 5.5.5 [DEVEL] (rgerhards), 2010-05-??
+Version 5.5.5 [DEVEL] (rgerhards), 2010-05-20
- added new cancel-reduced action thread termination method
We now manage to cancel threads that block inside a retry loop to
terminate without the need to cancel the thread. Avoiding cancellation
diff --git a/configure.ac b/configure.ac
index 653edfb2..a25cfc0c 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.5.4],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[5.5.5],[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 43395cec..b9085daf 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.5.4 (devel branch) of rsyslog.</b>
+<p><b>This documentation is for version 5.5.5 (devel 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