From 8162ff020d7c37ca1c9ec18e31e09e7f18df1cac Mon Sep 17 00:00:00 2001
From: Rainer Gerhards
Date: Thu, 30 Jun 2011 10:09:03 +0200
Subject: preparing for 5.9.1 release
---
ChangeLog | 2 +-
configure.ac | 2 +-
doc/manual.html | 2 +-
plugins/imklog/linux.c | 3 ---
4 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3459f7d1..a88b9e90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
---------------------------------------------------------------------------
-Version 5.9.1 [V5-DEVEL] (rgerhards), 2011-06-??
+Version 5.9.1 [V5-DEVEL] (rgerhards), 2011-06-30
- added support for obtaining timestamp for kernel message from message
If the kernel time-stamps messages, time is now take from that
timestamp instead of the system time when the message was read. This
diff --git a/configure.ac b/configure.ac
index 41468f16..7656d9a7 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.0],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[5.9.1],[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 f6ae3000..ae58de47 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.0 (stable branch) of rsyslog.
+
This documentation is for version 5.9.1 (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/plugins/imklog/linux.c b/plugins/imklog/linux.c
index 8d9c8ad7..b44619f5 100644
--- a/plugins/imklog/linux.c
+++ b/plugins/imklog/linux.c
@@ -254,9 +254,6 @@ submitSyslog(int pri, uchar *buf)
secOffs--;
nsecOffs += 1000000000l;
}
- monotonic.tv_sec, monotonic.tv_nsec,
- realtime.tv_sec, realtime.tv_nsec,
- secOffs, nsecOffs);
nsecs +=nsecOffs;
if(nsecs > 999999999l) {
--
cgit