summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-01-27 11:25:59 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2012-01-27 11:25:59 +0100
commitfdcf69caf9754a2d7464856fb90e634a6be9d65e (patch)
treec89c6650af3170d9a92831132bd99d75fb511cf8 /ChangeLog
parentcca05921dcfab557a4743a56c78683e4c1113e2a (diff)
parentc129ddcc637875442dbf9e0869f5eafbd08199ae (diff)
downloadrsyslog-fdcf69caf9754a2d7464856fb90e634a6be9d65e.tar.gz
rsyslog-fdcf69caf9754a2d7464856fb90e634a6be9d65e.tar.xz
rsyslog-fdcf69caf9754a2d7464856fb90e634a6be9d65e.zip
Merge branch 'v5-stable-newstats' into v5-devel
Conflicts: configure.ac
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog2
1 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index fe8ae053..87a7cac8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -131,6 +131,7 @@ Version 5.8.7 [V5-stable] 2012-01-17
- bugfix: stats counter were not properly initialized on creation
- FQDN hostname for multihomed host was not always set to the correct name
if multiple aliases existed. Thanks to Tomas Heinreich for the patch.
+- re-licensed larger parts of the codebase under the Apache license 2.0
---------------------------------------------------------------------------
Version 5.8.6 [V5-stable] 2011-10-21
- bugfix: missing whitespace after property-based filter was not detected
@@ -987,6 +988,7 @@ Version 4.8.1 [v4-stable], 2011-09-??
- added doc for omprog
- FQDN hostname for multihomed host was not always set to the correct name
if multiple aliases existed. Thanks to Tomas Heinreich for the patch.
+- re-licensed larger parts of the codebase under the Apache license 2.0
---------------------------------------------------------------------------
Version 4.8.0 [v4-stable] (rgerhards), 2011-09-07
***************************************************************************