summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-10-16 15:45:21 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-10-16 15:45:21 +0200
commit9cfb0aee7d7fa5304b44cbc35e005cc8189bb581 (patch)
treee4c2199da07df5a0e93b22fd9b7eb1ab0206a702
parentf3817aa885da93f7ab3441d6d8a4c6f4b2072d25 (diff)
downloadrsyslog-9cfb0aee7d7fa5304b44cbc35e005cc8189bb581.tar.gz
rsyslog-9cfb0aee7d7fa5304b44cbc35e005cc8189bb581.tar.xz
rsyslog-9cfb0aee7d7fa5304b44cbc35e005cc8189bb581.zip
prepare for version 7.1.11
-rw-r--r--ChangeLog8
-rw-r--r--configure.ac2
-rw-r--r--doc/manual.html2
3 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d9544bd8..7b73cf7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,12 @@
---------------------------------------------------------------------------
-Version 7.1.11 [beta] 2012-10-??
+Version 7.1.11 [beta] 2012-10-16
+- bugfix: imuxsock truncated head of received message
+ This happened only under some circumstances. Thanks to Marius
+ Tomaschwesky, Florian Piekert and Milan Bartos for their help in
+ solving this issue.
- bugfix: do not crash if set statement is used with date field
Thanks to Miloslav Trmač for the patch.
-- change lumberjack cookie to "@cee" from "@cee "
+- change lumberjack cookie to "@cee:" from "@cee: "
CEE originally specified the cookie with SP, whereas other lumberjack
tools used it without space. In order to keep interop with lumberjack,
we now use the cookie without space as well. I hope this can be changed
diff --git a/configure.ac b/configure.ac
index f1ec4c0d..09217d09 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.1.10],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[7.1.11],[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 6fa3c012..cfad1a6a 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 7.1.10 (beta branch) of rsyslog.</b>
+<p><b>This documentation is for version 7.1.11 (beta 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