diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-01 12:47:28 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-01 12:47:28 +0100 |
commit | facf8cc3e65cab8b8c8a08cea51970386cba539f (patch) | |
tree | 49cfdd6808467bfe4838555abb63ecdd1f5e3794 /ChangeLog | |
parent | f9ec561e6ee96e2c864bb69773ad6fc7303aef58 (diff) | |
parent | 01e6df368cdec89920d075fe096971481cb8ce49 (diff) | |
download | rsyslog-facf8cc3e65cab8b8c8a08cea51970386cba539f.tar.gz rsyslog-facf8cc3e65cab8b8c8a08cea51970386cba539f.tar.xz rsyslog-facf8cc3e65cab8b8c8a08cea51970386cba539f.zip |
Merge branch 'v3-stable' into v4-stable
Conflicts:
runtime/ctok.c
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -496,6 +496,9 @@ version before switching to this one. Thanks to Ken for providing the patch --------------------------------------------------------------------------- Version 3.22.2 [v3-stable] (rgerhards), 2009-07-?? +- bugfix: comment char ('#') in literal terminated script parsing + and thus could not be used. + but tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=119 - enhance: imrelp now also provides remote peer's IP address [if librelp != 1.0.0 is used] - bugfix: sending syslog messages with zip compression did not work |