diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-21 17:18:16 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-21 17:18:16 +0100 |
| commit | a418fb87ee078456e0761ddb676542c192ae8f04 (patch) | |
| tree | 4290712d00046020ffc39d8fe96c5def8a34ce2e | |
| parent | 92f7e549df5a1333f037cf3b290e3087fd9ad5da (diff) | |
| parent | e4c6373b4fc55af346fc091fd9782326a00b9128 (diff) | |
| download | rsyslog-a418fb87ee078456e0761ddb676542c192ae8f04.tar.gz rsyslog-a418fb87ee078456e0761ddb676542c192ae8f04.tar.xz rsyslog-a418fb87ee078456e0761ddb676542c192ae8f04.zip | |
Merge branch 'v4-stable' into v5-stable
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | Makefile.am | 2 |
2 files changed, 3 insertions, 0 deletions
@@ -867,6 +867,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 de4777b2..48eb26ce 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,7 +60,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 \ |