From 80d62d6bb7fe19c50f10732f98c8de90094845b0 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards
Date: Thu, 12 Apr 2012 14:58:42 +0200
Subject: preparing for 5.9.6
---
ChangeLog | 7 +++++--
configure.ac | 2 +-
doc/manual.html | 11 +++++++----
doc/version_naming.html | 4 ++--
4 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 35b0656f..2d817343 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
---------------------------------------------------------------------------
-Version 5.9.6 [V5-DEVEL], 2012-03-??
+Version 5.9.6 [V5-BETA], 2012-04-12
+- added configuration directives to customize queue light delay marks
- permit size modifiers (k,m,g,...) in integer config parameters
Thanks to Jo Rhett for the suggestion.
+- bugfix: hostname was not requeried on HUP
+ Thanks to Per Jessen for reporting this bug and Marius Tomaschewski for
+ his help in testing the fix.
- bugfix: imklog invalidly computed facility and severity
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=313
- added configuration directive to disable octet-counted framing
@@ -9,7 +13,6 @@ Version 5.9.6 [V5-DEVEL], 2012-03-??
for imptcp, directive is $InputPTCPServerSupportOctetCountedFraming
- added capability to use a local interface IP address as fromhost-ip for
locally originating messages. New directive $LocalHostIPIF
-- added configuration directives to customize queue light delay marks
---------------------------------------------------------------------------
Version 5.9.5 [V5-DEVEL], 2012-01-27
- improved impstats subsystem, added many new counters
diff --git a/configure.ac b/configure.ac
index ccb2c47a..6e140b31 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.5],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[5.9.6],[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 fdeb2980..55809f3e 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.4 (stable branch) of rsyslog.
+
This documentation is for version 5.9.6 (stable branch) of rsyslog.
Visit the rsyslog status page
to obtain current version information and project status.
If you like rsyslog, you might
@@ -46,8 +46,9 @@ if you do not read the doc, but doing so will definitely improve your experience
backgrounder on generic syslog application design
description of rsyslog modules
rsyslog packages
-the rsyslog "cookbook" - a set of configurations ready to use
+
To keep current on rsyslog development, follow
+Rainer's twitter feed.
We have some in-depth papers on
- installing rsyslog
@@ -103,14 +104,16 @@ online documentation (most current version only)
mailing list. If you are interested in the "backstage", you
may find
Rainer's
-blog an
+blog an
interesting read (filter on syslog and rsyslog tags).
+Or meet Rainer Gerhards at Facebook
+or Google+.
If you would like to use rsyslog source code inside your open source project, you can do that without
any restriction as long as your license is GPLv3 compatible. If your license is incompatible to GPLv3,
you may even be still permitted to use rsyslog source code. However, then you need to look at the way
rsyslog is licensed.
Feedback is always welcome, but if you have a support question, please do not
mail Rainer directly (why not?) - use the
-rsyslogmailing list
+rsyslog mailing list
or rsyslog formum instead.