summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-04-04 10:08:28 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2013-04-04 10:08:28 +0200
commit22a78faa003afb3eed78268e939431f211c26a20 (patch)
tree42eb40348360155bbf9f99e3066b707170d84438
parentf6da383e1c9d3ccfc5742d972c23dc3c718a0b88 (diff)
parentcbf0ed9541fee2a480dda3533d1604a9df4ae9bb (diff)
downloadrsyslog-22a78faa003afb3eed78268e939431f211c26a20.tar.gz
rsyslog-22a78faa003afb3eed78268e939431f211c26a20.tar.bz2
rsyslog-22a78faa003afb3eed78268e939431f211c26a20.zip
Merge branch 'v7-stable'
-rw-r--r--ChangeLog2
1 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index bbc635cf..97114227 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -221,6 +221,8 @@ Version 7.2.7 [v7-stable] 2013-03-??
The rsyslog debug log file is now continued to be written across the
fork.
- updated systemd files to match current systemd source
+- bugfix: script == comparison did not work properly on JSON objects
+ [backport from 7.3 branch]
- bugfix: imudp scheduling parameters did affect main thread, not imudp
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=409
- bugfix: imuxsock rate-limiting could not be configured via legacy conf