summaryrefslogtreecommitdiffstats
path: root/ChangeLog
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v6-stable'Rainer Gerhards2012-05-031-1/+37
|\ | | | | | | | | Conflicts: tools/syslogd.c
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-05-031-1/+27
| |\ | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * preparing for 5.8.11 releasev5.8.11Rainer Gerhards2012-05-031-1/+1
| | |
| | * bugfix: ommysql did not properly init/exit the mysql runtime libraryRainer Gerhards2012-05-031-0/+5
| | | | | | | | | | | | | | | | | | | | | This could lead to segfaults. Triggering condition: multiple action instances using ommysql. Thanks to Tomas Heinrich for reporting this problem and providing an initial patch (which my solution is based on, I need to add more code to clean the mess up).
| | * bugfix: rsyslog did not terminate when delayable inputs were blockedRainer Gerhards2012-05-031-0/+5
| | | | | | | | | | | | | | | | | | | | | ...due to unvailable sources. Fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=299 Thanks to Marcin M for bringing up this problem and Andre Lorbach for helping to reproduce and fix it.
| | * bugfix: inside queue.c, some thread cancel states were not correctly reset.Rainer Gerhards2012-05-031-0/+4
| | | | | | | | | | | | | | | | | | While this is a bug, we assume it did have no practical effect because the reset as it was done was set to the state the code actually had at this point. But better fix this...
| | * bugfix: active input in "light delay state" could block rsyslog terminationRainer Gerhards2012-04-271-0/+2
| | | | | | | | | | | | at least for prolonged period of time...
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-191-0/+2
| |\|
* | | bugfix/omfile: template action parameter was not acceptedRainer Gerhards2012-05-031-0/+3
| | | | | | | | | | | | | | | (and template name set to "??" if the parameter was used) Thanks to Brian Knox for alerting us on this bug.
* | | Merge branch 'master-fieldext'Rainer Gerhards2012-04-261-0/+1
|\ \ \
| * | | added capability to specify substrings for field extraction modeRainer Gerhards2012-04-261-0/+1
| | | |
* | | | bugfix: omudpspoof did not work correctly if no spoof hostname was configuredRainer Gerhards2012-04-231-0/+2
|/ / /
* | | Merge branch 'v5-beta'Rainer Gerhards2012-04-191-0/+4
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: plugins/imptcp/imptcp.c
| * \ \ Merge branch 'v5-stable-newstats' into v5-betaRainer Gerhards2012-04-191-0/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| | * \ \ Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-191-0/+2
| | |\ \ \ | | | | |/ | | | |/|
| | | * | doc: added last bugfix to ChangeLogRainer Gerhards2012-04-191-0/+2
| | | | |
| | * | | doc: add last bugfix to changelogRainer Gerhards2012-04-191-0/+2
| | | | | | | | | | | | | | | | | | | | and bump up version
| * | | | Merge branch 'v5-stable-newstats' into v5-betaRainer Gerhards2012-04-181-0/+4
| |\| | |
| | * | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-181-0/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/msg.c
* | | | | added the "jsonf" property replacer option (and fieldname) & bugfixRainer Gerhards2012-04-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | bugfix: property replacer option "json" could lead to content loss message was truncated if escaping was necessary
* | | | | Merge branch 'v6-stable'Rainer Gerhards2012-04-181-0/+8
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/msg.c runtime/ruleset.c runtime/ruleset.h
| * | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-181-0/+4
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | bugfix: assigned ruleset was lost when using disk queuesRainer Gerhards2012-04-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This looked quite hard to diagnose for disk-assisted queues, as the pure memory part worked well, but ruleset info was lost for messages stored inside the disk queue.
| * | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-121-0/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
* | | | | bugfix/imuxsock: configured hostname was not usedRainer Gerhards2012-04-161-1/+2
| | | | |
* | | | | bugfix/imuxsock: solving abort if hostname was not setRainer Gerhards2012-04-161-0/+3
| | | | |
* | | | | preparing for 6.3.8 releasev6.3.8Rainer Gerhards2012-04-161-1/+1
| | | | |
* | | | | Merge branch 'v5-beta'Rainer Gerhards2012-04-121-14/+39
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c tools/syslogd.c
| * | | | preparing for 5.9.6v5.9.6Rainer Gerhards2012-04-121-2/+5
| | | | |
| * | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-121-0/+5
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-121-0/+5
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/glbl.c
| | | * | doc: credits update for last bugfixRainer Gerhards2012-04-111-1/+2
| | | | |
| | | * | bugfix: hostname was not requeried on HUPRainer Gerhards2012-04-111-0/+4
| | | | | | | | | | | | | | | | | | | | Thanks to Marius Tomaschewski for reporting this bug.
* | | | | Merge branch 'v5-devel'Rainer Gerhards2012-04-071-0/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c
| * | | | permit size modifiers (k,m,g,...) in integer config parametersRainer Gerhards2012-04-071-0/+2
| | | | | | | | | | | | | | | | | | | | Thanks to Jo Rhett for the suggestion.
| * | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-071-3/+12
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html
| * | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-201-0/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imptcp/imptcp.c
| * \ \ \ \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-191-0/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imtcp/imtcp.c tcpsrv.h
| * \ \ \ \ \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-141-0/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| * \ \ \ \ \ \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-121-1/+11
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/imuxsock.html doc/manual.html runtime/queue.c
| * \ \ \ \ \ \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2012-03-011-0/+11
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imklog/imklog.c plugins/imklog/imklog.h
| * | | | | | | | | bugfix: imklog invalidly computed facility and severityRainer Gerhards2012-03-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=313
* | | | | | | | | | Merge branch 'v5-stable-newstats'Rainer Gerhards2012-04-071-0/+8
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: action.c configure.ac doc/imuxsock.html plugins/imklog/imklog.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c runtime/glbl.c runtime/glbl.h runtime/net.c runtime/ruleset.c tcpsrv.h tools/syslogd.c
| * | | | | | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-071-1/+1
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| * | | | | | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-071-1/+11
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| * | | | | | | | | | milestone: added capability to use a local interface IP address as fromhost-ipRainer Gerhards2012-03-211-2/+1
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... for locally originating messages. New directive $LocalHostIPIF. Note that not all modules yet support this new directive - next step...
| * | | | | | | | | added configuration directive to disable octet-counted framingRainer Gerhards2012-03-201-0/+1
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | for imptcp, directive is $InputPTCPServerSupportOctetCountedFraming
| * | | | | | | | added configuration directive to disable octet-counted framingRainer Gerhards2012-03-191-0/+2
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | ... for imtcp, directive is $InputTCPServerSupportOctetCountedFraming
| * | | | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-03-141-0/+3
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/queue.c runtime/queue.h
| * | | | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-03-121-0/+4
| |\ \ \ \ \ \ \