summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac2
-rw-r--r--doc/manual.html2
-rw-r--r--plugins/imklog/linux.c3
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</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.9.0 (stable branch) of rsyslog.</b>
+<p><b>This documentation is for version 5.9.1 (stable branch) of rsyslog.</b>
Visit the <i><a href="http://www.rsyslog.com/status">rsyslog status page</a></i></b>
to obtain current version information and project status.
</p><p><b>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) {