summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-01-08 15:59:09 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2013-01-08 15:59:09 +0100
commitae4f1c56d9497236023e7be8f2d1d8050aa41068 (patch)
treef947548ebc13b80f2e1b1cd44ea5c074b01bae75
parentcd43df6fdbbe1062242f58db2174e8c45aaf64dc (diff)
parent55d6eef1be47df7312e8e59a64ad9b0de6298f2f (diff)
downloadrsyslog-ae4f1c56d9497236023e7be8f2d1d8050aa41068.tar.gz
rsyslog-ae4f1c56d9497236023e7be8f2d1d8050aa41068.tar.bz2
rsyslog-ae4f1c56d9497236023e7be8f2d1d8050aa41068.zip
Merge branch 'v7-stable'
Conflicts: ChangeLog configure.ac doc/manual.html
-rw-r--r--ChangeLog3
1 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 341ae77d..11bc7e59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -125,7 +125,7 @@ Version 7.3.0 [devel] 2012-10-09
This was achieved by somewhat reducing the robustness of the zip archive.
This is controlled by the new action parameter "VeryReliableZip".
----------------------------------------------------------------------------
-Version 7.2.5 [v7-stable] 2013-01-??
+Version 7.2.6 [v7-stable] 2013-01-??
- omudpspoof: add support for new config system
- omudpspoof: add support for packets larger than 1472 bytes
On Ethernet, they need to be transmitted in multiple fragments. While
@@ -136,6 +136,7 @@ Version 7.2.5 [v7-stable] 2013-01-??
lead to problems (unfortunately, at least some libnet versions do not
report a proper error state but still "success"...). The order of libnet
calls has been adjusted to by in sync with what the core engine does.
+Version 7.2.5 [v7-stable] 2013-01-08
- build system cleanup (thanks to Michael Biebl for this!)
- bugfix: omelasticsearch did not properly compile on some platforms
due to missing libmath. Thanks to Michael Biebl for the fix