summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-04-11 09:08:17 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2013-04-11 09:08:17 +0200
commit7748d6678771ab8ce32f8990b7bf586578b872e0 (patch)
tree4702d0b2ee7fa0db1939e5472c5011ea4f37d1d5
parent5242a0b4a351d41ea6f20adc359bbcde8e1b3cfe (diff)
parent22a78faa003afb3eed78268e939431f211c26a20 (diff)
downloadrsyslog-7748d6678771ab8ce32f8990b7bf586578b872e0.tar.gz
rsyslog-7748d6678771ab8ce32f8990b7bf586578b872e0.tar.bz2
rsyslog-7748d6678771ab8ce32f8990b7bf586578b872e0.zip
Merge branch 'master' into master-crypto
-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