diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-06-25 15:27:58 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-06-25 15:27:58 +0200 |
| commit | a3a5924d9e51512f63dfaa7a945185d960396048 (patch) | |
| tree | 55cb64104a5654df17a81ba2e272ca1fecf82a38 | |
| parent | 86414704b48e4f011f8f5a0fd7f0b1a523b90bdc (diff) | |
| parent | b46151989f97aaa3bc520c56f3c87fe2bc068958 (diff) | |
| download | rsyslog-a3a5924d9e51512f63dfaa7a945185d960396048.tar.gz rsyslog-a3a5924d9e51512f63dfaa7a945185d960396048.tar.xz rsyslog-a3a5924d9e51512f63dfaa7a945185d960396048.zip | |
Merge branch 'v3-stable' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
| -rw-r--r-- | ChangeLog | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -68,7 +68,7 @@ Version 3.17.0 (rgerhards), 2008-04-08 Plus a number of bugfixes that were applied to v3-stable and beta branches (not mentioned here in detail). --------------------------------------------------------------------------- -Version 3.16.2 (rgerhards), 2008-05-14 +Version 3.16.2 (rgerhards), 2008-06-25 - fixed potential segfault due to invalid call to cfsysline thanks to varmojfekoj for the patch - bugfix: some whitespaces where incorrectly not ignored when parsing |