summaryrefslogtreecommitdiffstats
path: root/ChangeLog
Commit message (Collapse)AuthorAgeFilesLines
* doc: add imported patch to ChangeLogRainer Gerhards2012-08-211-0/+2
|
* Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslogRainer Gerhards2012-08-021-0/+3
|\
| * Merge branch 'beta'Rainer Gerhards2012-08-011-0/+3
| |\
| | * doc: add last patch to ChangelogRainer Gerhards2012-08-011-0/+3
| | |
* | | doc: added last patch to ChangeLogRainer Gerhards2012-07-311-0/+2
|/ /
* | Merge branch 'beta'Rainer Gerhards2012-07-241-3/+8
|\| | | | | | | | | | | Conflicts: ChangeLog configure.ac
| * bugfix: imptcp aborted when $InputPTCPServerBindRuleset was usedRainer Gerhards2012-07-241-0/+1
| |
| * Merge branch 'v5-stable' into betaRainer Gerhards2012-07-241-0/+1
| |\
| * | bugfix: imtcp aborted when more than 2 connections were used.Andre Lorbach2012-07-111-0/+3
| | | | | | | | | | | | | | | Incremented pthread stack size to 4MB for imtcp, imptcp and imttcp closes: http://bugzilla.adiscon.com/show_bug.cgi?id=342
| * | omelasticsearch: support for parameters parent & dynparent addedRainer Gerhards2012-07-101-0/+3
| | |
| * | preparing for 6.3.12v6.3.12Rainer Gerhards2012-07-021-3/+1
| | |
* | | Merge branch 'v5-stable'Rainer Gerhards2012-07-241-0/+1
|\ \ \ | | |/ | |/|
| * | bugfix: DA queue could cause abortRainer Gerhards2012-07-241-0/+1
| | | | | | | | | | | | | | | ...due to invalid mutex synchronisation in DA worker. In case of idle queue, mutex was incorrectly locked.
* | | bugfix: omhdfs did no longer compileRainer Gerhards2012-07-111-0/+1
| | |
* | | Merge branch 'beta'Rainer Gerhards2012-06-291-0/+7
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h
| * | cosmetic: added info about omelasticsearch to ChangeLogRainer Gerhards2012-06-291-0/+7
| | |
* | | Merge branch 'beta' into master-moduleRainer Gerhards2012-06-291-1/+5
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac plugins/imklog/imklog.c plugins/imklog/imklog.h
| * | bugfix: $ActionName was not properly honoredRainer Gerhards2012-06-271-0/+4
| | | | | | | | | | | | Thanks to Abby Edwards for alerting us.
| * | preparing for 6.3.11v6.3.11Rainer Gerhards2012-06-181-1/+1
| | |
* | | implemented freeCnf() module interface & fixed some mem leaksRainer Gerhards2012-06-251-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | The interface was actually not present in older versions, even though some modules already used it. The implementation was now done, and not in 6.3/6.4 because the resulting memory leak was ultra-slim and the new interface handling has some potential to seriously break things. Not the kind of thing you want to add in late beta state, if avoidable.
* | | Merge branch 'beta'Rainer Gerhards2012-06-151-0/+5
|\| |
| * | Merge branch 'v6-stable' into betaRainer Gerhards2012-06-151-0/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/omudpspoof/omudpspoof.c tools/syslogd.c
| | * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-06-151-0/+5
| | |\|
| | | * bugfix: randomized IP option header in omudpspoof caused problemsRainer Gerhards2012-06-151-0/+3
| | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=327 Thanks to Rick Brown for helping to test out the patch.
| | | * bugfix "$PreserveFQDN on" was not honored in some modulesRainer Gerhards2012-06-121-0/+2
| | | | | | | | | | | | | | | | | | | | Thanks to bodik for reporting this bug. ---------------------------------------------
* | | | Merge branch 'beta'Rainer Gerhards2012-06-141-1/+3
|\| | |
| * | | Merge branch 'v6-stable' into betaRainer Gerhards2012-06-141-1/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | preparing for 6.2.2 releasev6.2.2Rainer Gerhards2012-06-131-1/+3
| | | |
* | | | cosmetic: merge remains in ChangeLog cleared upRainer Gerhards2012-06-121-3/+0
| | | |
* | | | Merge branch 'v5-beta'Rainer Gerhards2012-06-111-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * \ \ \ Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-111-0/+6
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | Conflicts: ChangeLog
* | | | | Merge branch 'beta'Rainer Gerhards2012-06-111-0/+25
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-06-111-0/+25
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-06-111-0/+6
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | Conflicts: ChangeLog
| | | * | bugfix: "last message repeated n times" message was missing hostnameRainer Gerhards2012-06-111-0/+4
| | | | | | | | | | | | | | | | | | | | Thanks to Zdenek Salvet for finding this bug and to Bodik for reporting
| | * | | bugfix: did not compile under solaris due to $uptime property codeRainer Gerhards2012-06-081-0/+2
| | | | | | | | | | | | | | | | | | | | For the time being, $uptime is not supported on Solaris
| | * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-06-061-1/+31
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
* | | | | Merge branch 'beta'Rainer Gerhards2012-06-111-0/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | bugfix: expression-based filters with AND/OR could segfaultRainer Gerhards2012-06-111-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | due to a problem with boolean shortcut operations. From the user's perspective, the segfault is almost non-deterministic (it occurs when a shortcut is used). Thanks to Lars Peterson for providing the initial bug report and his support in solving it.
* | | | | Merge branch 'beta'Rainer Gerhards2012-06-061-1/+31
|\| | | |
| * | | | Merge branch 'v5-beta' into betaRainer Gerhards2012-06-061-1/+31
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | Conflicts: runtime/modules.c
| | * | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-061-1/+31
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/modules.c
| | | * | preparing for 5.8.12v5.8.12Rainer Gerhards2012-06-061-1/+1
| | | | |
| | | * | bugfix: property PROCID was empty instead of proper nilvalue if not presentRainer Gerhards2012-06-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If it is not present, it must have the nilvalue "-" as of RFC5424 closes: http://bugzilla.adiscon.com/show_bug.cgi?id=332 Thanks to John N for reporting this issue.
| | | * | bugfix: potential hang due to mutex deadlockRainer Gerhards2012-06-061-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=316 Thanks to Andreas Piesk for reporting&analyzing this bug as well as providing patches and other help in resolving it.
| | | * | fixing memleak in recent group resolve patchRainer Gerhards2012-06-061-0/+3
| | | | | | | | | | | | | | | | | | | | also added some error checking
| | | * | add small delay (50ms) after sending shutdown messageRainer Gerhards2012-06-041-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There seem to be cases where the shutdown message is otherwise not processed, not even on an idle system. Thanks to Marcin for bringing this problem up.
* | | | | cosmetic: updated ChangeLog to mention new 0mq pluginsRainer Gerhards2012-06-041-0/+2
| | | | |
* | | | | Merge branch 'beta'Rainer Gerhards2012-06-041-1/+16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| * | | | bugfix: made rsyslog compile when libestr ist not installed in /usrv6.3.10Rainer Gerhards2012-06-041-0/+2
| | | | | | | | | | | | | | | | | | | | Thanks to Miloslav Trmač for providing patches and suggestions