summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-01-21 17:17:23 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2012-01-21 17:17:23 +0100
commite4c6373b4fc55af346fc091fd9782326a00b9128 (patch)
tree0a4bf1056a0621873f4010ee68461fe1ef5f8378
parent209a6d8e15afb83c0bf146dd95fc203bb9983242 (diff)
downloadrsyslog-e4c6373b4fc55af346fc091fd9782326a00b9128.tar.gz
rsyslog-e4c6373b4fc55af346fc091fd9782326a00b9128.tar.xz
rsyslog-e4c6373b4fc55af346fc091fd9782326a00b9128.zip
license docs were not properly redistributed
thanks to Tomas Heinrich for alerting me.
-rw-r--r--ChangeLog1
-rw-r--r--Makefile.am2
2 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 611127d6..a5a5fd6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,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
***************************************************************************
diff --git a/Makefile.am b/Makefile.am
index 111756f6..2aa2c398 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,7 +44,9 @@ EXTRA_DIST = \
slackware/rc.rsyslogd \
contrib/README \
rsyslog.conf \
+ COPYING \
COPYING.LESSER \
+ COPYING.ASL20 \
contrib/gnutls/ca.pem \
contrib/gnutls/cert.pem \
contrib/gnutls/key.pem