From b1490b052283da0f5c459c6ad30b81d125abc782 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards
Date: Thu, 13 Mar 2014 11:57:24 +0100
Subject: [PATCH] prepare for 7.6.1 release
---
ChangeLog | 4 ++--
configure.ac | 2 +-
doc/manual.html | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index caba06c38..b62f863ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
---------------------------------------------------------------------------
-Version 7.6.1 [v7.6-stable] 2014-02-??
+Version 7.6.1 [v7.6-stable] 2014-03-13
- added "action.reportSuspension" action parameter
This now permits to control handling on a per-action basis rather to
the previous "global setting only".
@@ -8,7 +8,7 @@ Version 7.6.1 [v7.6-stable] 2014-02-??
the config details (like destination etc) as this would require much more
elaborate code changes, which we at least do not like to do in the
stable version.
-- better and more consistent action naming, action queus now always
+- better and more consistent action naming, action queues now always
contain the word "queue" after the action name
- add support for "tls-less" librelp
we now require librelp 1.2.3, as we need the new error code definition
diff --git a/configure.ac b/configure.ac
index 44ac53863..5feb6f517 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],[7.6.0],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[7.6.1],[rsyslog@lists.adiscon.com])
AM_INIT_AUTOMAKE([subdir-objects])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff --git a/doc/manual.html b/doc/manual.html
index 0c777caa7..c132775fe 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -19,7 +19,7 @@ professional services 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 7.6.0 (v7.6-stable branch) of rsyslog.
+
This documentation is for version 7.6.1 (v7.6-stable branch) of rsyslog.
Visit the rsyslog status page
to obtain current version information and project status.
If you like rsyslog, you might