summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-06-29 15:51:46 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-06-29 15:51:46 +0200
commitba5f628cbb43d6a4add15c6fab50e35b5c54c5b8 (patch)
tree74dbe259b64d8f6e839e5c99a7d99f2edaf32f2b /ChangeLog
parent40334847b685e6058be562b4436f72426637f4d8 (diff)
parentb397a80c88be0de6e7450bcbeb3524be98e572b6 (diff)
downloadrsyslog-ba5f628cbb43d6a4add15c6fab50e35b5c54c5b8.tar.gz
rsyslog-ba5f628cbb43d6a4add15c6fab50e35b5c54c5b8.tar.xz
rsyslog-ba5f628cbb43d6a4add15c6fab50e35b5c54c5b8.zip
Merge branch 'beta'
Conflicts: ChangeLog runtime/rsyslog.h
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog7
1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3ac89c65..04cbb1f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,13 @@ Version 6.5.0 [devel] 2012-0?-??
- added new 0mq plugins (via czmq lib)
Thanks to David Kelly for contributing these modules
---------------------------------------------------------------------------
+Version 6.3.13 [BETA] 2012-06-??
+- 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