summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-07-24 12:48:39 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-07-24 12:48:39 +0200
commitcf100be58c69e34f42b15c03b6104139d37eb47b (patch)
treec6ea5b5eb7e6b6080498ef03882aa54cda417c9b /ChangeLog
parent87311d12771fc94e2d324e73922bd5e0b07de64e (diff)
parent686270440c601d5a4e3eac246397f60248889f5f (diff)
downloadrsyslog-cf100be58c69e34f42b15c03b6104139d37eb47b.tar.gz
rsyslog-cf100be58c69e34f42b15c03b6104139d37eb47b.tar.xz
rsyslog-cf100be58c69e34f42b15c03b6104139d37eb47b.zip
Merge branch 'beta'
Conflicts: ChangeLog configure.ac
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog11
1 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 672be4f6..0ad873b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,14 +15,19 @@ Version 6.5.0 [devel] 2012-0?-??
Thanks to David Kelly for contributing these modules
- bugfix: omhdfs did no longer compile
---------------------------------------------------------------------------
-Version 6.3.13 [BETA] 2012-06-??
+Version 6.3.13 [BETA] 2012-07-??
+- omelasticsearch: support for parameters parent & dynparent added
+- bugfix: imtcp aborted when more than 2 connections were used.
+ Incremented pthread stack size to 4MB for imtcp, imptcp and imttcp
+ closes: http://bugzilla.adiscon.com/show_bug.cgi?id=342
+- bugfix: imptcp aborted when $InputPTCPServerBindRuleset was used
+---------------------------------------------------------------------------
+Version 6.3.12 [BETA] 2012-07-02
- support for elasticsearch via omelasticsearch added
Note that this module has been tested quite well by a number of folks,
and this is why we merge in new functionality in a late beta stage.
Even if problems would exist, only users of omelasticsearch would
experience them, making it a pretty safe addition.
----------------------------------------------------------------------------
-Version 6.3.12 [BETA] 2012-06-18
- bugfix: $ActionName was not properly honored
Thanks to Abby Edwards for alerting us
---------------------------------------------------------------------------