summaryrefslogtreecommitdiffstats
path: root/ChangeLog
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \
| * | | | | | | added capability to use a local interface IP address as fromhost-ip for imklogRainer Gerhards2012-03-101-2/+2
| | | | | | | |
| * | | | | | | added capability to use a local interface IP address as fromhost-ip for imuxsockRainer Gerhards2012-03-061-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new config directives: $IMUXSockLocalIPIF
| * | | | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-03-051-1/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| * | | | | | | | added configuration directives to customize queue light delay marksRainer Gerhards2012-02-211-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $MainMsgQueueLightDelayMark, $ActionQueueLightDelayMark; both specify number of messages starting at which a delay happens.
* | | | | | | | | Merge branch 'v6-stable'Rainer Gerhards2012-04-071-1/+6
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-071-1/+6
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | | | | | | preparing for 5.8.10v5.8.10Rainer Gerhards2012-04-071-1/+1
| | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | bugfix: segfault on startup if $actionqueuefilename was missing for disk ↵Tomas Heinrich2012-04-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | queue config Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * | | | | | | bugfix: segfault if disk-queue was started up with old queue fileTomas Heinrich2012-04-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | | | | | | doc: fix typo in ChangeLogRainer Gerhards2012-04-071-1/+1
| | | | | | | | |
* | | | | | | | | impstats: added $PStatsJSON directiveRainer Gerhards2012-04-011-0/+1
| | | | | | | | |
* | | | | | | | | added "date-unixtimestamp" property replacer option to format as a unix ↵Rainer Gerhards2012-03-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timestamp
* | | | | | | | | initial shot at omhiredisBrian Knox2012-03-211-0/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'v6-stable'Rainer Gerhards2012-03-171-1/+7
|\| | | | | | | |
| * | | | | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-03-171-1/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | | | | | bugfix: memory leak in array passing output module modeRainer Gerhards2012-03-171-0/+3
| | | | | | | | |
| | * | | | | | | preparing for 5.8.9v5.8.9Rainer Gerhards2012-03-151-1/+1
| | | | | | | | |
| | * | | | | | | added tool to recover disk queue if .qi file is missing (recover_qi.pl)Kaiwang Chen2012-03-151-0/+2
| | | |_|_|/ / / | | |/| | | | |
* | | | | | | | bugfix: memory leak in array passing output module modeRainer Gerhards2012-03-171-0/+1
| | | | | | | |
* | | | | | | | Merge branch 'v6-stable'Rainer Gerhards2012-03-171-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/queue.c runtime/queue.h
| * | | | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-03-141-0/+3
| |\| | | | | |
| | * | | | | | changed statsobj interface and added better docRainer Gerhards2012-03-141-0/+3
| | | |_|/ / / | | |/| | | |
* | | | | | | added "json" property replacer optionRainer Gerhards2012-03-161-1/+3
| | | | | | |
* | | | | | | added message property parsesuccess to indicate status of higher level ↵Rainer Gerhards2012-03-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parser run added message property parsesuccess to indicate if the last run higher-level parser could successfully parse the message or not (see property replacer html doc for details)
* | | | | | | Merge branch 'v6-stable'Rainer Gerhards2012-03-121-1/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/queue.c
| * | | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-03-121-1/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | | | bugfix: stopped DA queue was never processed after a restartRainer Gerhards2012-03-121-0/+4
| | | |/ / / | | |/| | | | | | | | | | | | | | | ...due to a regression from statistics module.