diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-26 10:56:19 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-26 10:56:19 +0200 |
| commit | 8812ffd58b59724c1bf5c1cae8c37740524274c4 (patch) | |
| tree | 87b26acde40f0f158f859d719c20916e7add9ec2 /ChangeLog | |
| parent | 7fb358a76f2c6dd86b951cb1639d1787810830c2 (diff) | |
| parent | 136f6e097800742ec232c968b2bdd03bfab687f4 (diff) | |
| download | rsyslog-8812ffd58b59724c1bf5c1cae8c37740524274c4.tar.gz rsyslog-8812ffd58b59724c1bf5c1cae8c37740524274c4.tar.xz rsyslog-8812ffd58b59724c1bf5c1cae8c37740524274c4.zip | |
Merge branch 'v5-stable' into v6-stable
Conflicts:
plugins/imrelp/imrelp.c
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -574,6 +574,8 @@ expected that interfaces, even new ones, break during the initial [ported from v4] --------------------------------------------------------------------------- Version 5.10.1 [V5-STABLE], 2012-0?-?? +- enable DNS resolution in imrelp + Thanks to Apollon Oikonomopoulos for the patch - bugfix: invalid property name in property-filter could cause abort if action chaining (& operator) was used http://bugzilla.adiscon.com/show_bug.cgi?id=355 |