summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-10-11 09:42:49 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-10-11 09:42:49 +0200
commit55f67bfc9fe14279d371fa2b899abaa8684621f3 (patch)
tree3b6246413dc1ad9b514e84be4b12cc22e7cebc53
parent98a94a68b677074c2061133eb273c3f66d65a8ce (diff)
parent5114dc9fa217ac2c8a0d99e714fa42749744fa80 (diff)
downloadrsyslog-55f67bfc9fe14279d371fa2b899abaa8684621f3.tar.gz
rsyslog-55f67bfc9fe14279d371fa2b899abaa8684621f3.tar.bz2
rsyslog-55f67bfc9fe14279d371fa2b899abaa8684621f3.zip
Merge branch 'beta'
Conflicts: ChangeLog
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0157652f..23eba26e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,11 @@ 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.1.10 [beta] 2012-10-11
+ - bugfix: m4 directory was not present in release tarball
+ - bugfix: small memory leak with string-type templates
+ - bugfix: small memory leak when template was specified in omfile
+ ---------------------------------------------------------------------------
Version 7.1.9 [beta] 2012-10-09
- bugfix: comments inside objects (e.g. action()) were not properly handled
- bugfix: in (non)equal comparisons the position of arrays influenced result