summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-02-18 11:36:26 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2011-02-18 11:36:26 +0100
commit8538bbe5afdb2a87f31de38ad26bc519235b4512 (patch)
tree914285789fda6d35230b390f3cb076efcb2bf135
parent9568e7dbbb50ceb7464b659283e97a63ba3b1bd6 (diff)
downloadrsyslog-8538bbe5afdb2a87f31de38ad26bc519235b4512.tar.gz
rsyslog-8538bbe5afdb2a87f31de38ad26bc519235b4512.tar.xz
rsyslog-8538bbe5afdb2a87f31de38ad26bc519235b4512.zip
preparing for 6.1.4 releasev6.1.4
-rw-r--r--ChangeLog23
-rw-r--r--configure.ac2
-rw-r--r--doc/manual.html2
3 files changed, 23 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d9ed9f6c..d7a1ca0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,31 @@
---------------------------------------------------------------------------
-Version 6.1.4 [DEVEL] (rgerhards), 2011-02-??
-- imported fixes and and enhancements from 5.7.4
+Version 6.1.4 [DEVEL] (rgerhards), 2011-02-18
- bugfix/omhdfs: directive $OMHDFSFileName rendered unusable
due to a search and replace-induced bug ;)
- bugfix: minor race condition in action.c - considered cosmetic
This is considered cosmetic as multiple threads tried to write exactly
the same value into the same memory location without sync. The method
has been changed so this can no longer happen.
+- added pmsnare parser module (written by David Lang)
+- enhanced imfile to support non-cancel input termination
+- improved systemd socket activation thanks to Marius Tomaschweski
+- improved error reporting for $WorkDirectory
+ non-existance and other detectable problems are now reported,
+ and the work directory is NOT set in this case
+- bugfix: pmsnare causded abort under some conditions
+- bugfix: abort if imfile reads file line of more than 64KiB
+ Thanks to Peter Eisentraut for reporting and analysing this problem.
+ bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=221
+- bugfix: queue engine did not properly slow down inputs in FULL_DELAY mode
+ when in disk-assisted mode. This especially affected imfile, which
+ created unnecessarily queue files if a large set of input file data was
+ to process.
+- bugfix: very long running actions could prevent shutdown under some
+ circumstances. This has now been solved, at least for common
+ situations.
+- bugfix: fixed compile problem due to empty structs
+ this occured only on some platforms/compilers. thanks to Dražen Kačar
+ for the fix
---------------------------------------------------------------------------
Version 6.1.3 [DEVEL] (rgerhards), 2011-02-01
- experimental support for monogodb added
diff --git a/configure.ac b/configure.ac
index 648f7315..b5fcdb4b 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],[6.1.3],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[6.1.4],[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 29813f5e..448e58f1 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 6.1.3 (devel branch) of rsyslog.</b>
+<p><b>This documentation is for version 6.1.4 (devel 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