summaryrefslogtreecommitdiffstats
path: root/ChangeLog
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * Merge branch 'v5-stable-newstats' into v5-betaRainer Gerhards2012-04-191-0/+4
| |\
| | * 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
| * | | 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
| | |\|
* | | | added the "jsonf" property replacer option (and fieldname) & bugfixRainer Gerhards2012-04-191-0/+3
* | | | Merge branch 'v6-stable'Rainer Gerhards2012-04-181-0/+8
|\ \ \ \
| * \ \ \ 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
| * | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-121-0/+5
| |\| | |
* | | | | 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
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | 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
| | |\ \ \ | | | | |/ | | | |/|
| | | * | doc: credits update for last bugfixRainer Gerhards2012-04-111-1/+2
| | | * | bugfix: hostname was not requeried on HUPRainer Gerhards2012-04-111-0/+4
* | | | | Merge branch 'v5-devel'Rainer Gerhards2012-04-071-0/+12
|\| | | |
| * | | | permit size modifiers (k,m,g,...) in integer config parametersRainer Gerhards2012-04-071-0/+2
| * | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-071-3/+12
| |\| | |
| * | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-201-0/+4
| |\ \ \ \
| * \ \ \ \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-191-0/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-141-0/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-121-1/+11
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2012-03-011-0/+11
| |\ \ \ \ \ \ \ \
| * | | | | | | | | bugfix: imklog invalidly computed facility and severityRainer Gerhards2012-03-011-0/+4
* | | | | | | | | | Merge branch 'v5-stable-newstats'Rainer Gerhards2012-04-071-0/+8
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-071-1/+1
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-071-1/+11
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | milestone: added capability to use a local interface IP address as fromhost-ipRainer Gerhards2012-03-211-2/+1
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | added configuration directive to disable octet-counted framingRainer Gerhards2012-03-201-0/+1
| | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | added configuration directive to disable octet-counted framingRainer Gerhards2012-03-191-0/+2
| | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-03-141-0/+3
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | 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
| * | | | | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-03-051-1/+3
| |\ \ \ \ \ \ \ \
| * | | | | | | | | added configuration directives to customize queue light delay marksRainer Gerhards2012-02-211-0/+3
* | | | | | | | | | Merge branch 'v6-stable'Rainer Gerhards2012-04-071-1/+6
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-071-1/+6
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | * | | | | | | | preparing for 5.8.10v5.8.10Rainer Gerhards2012-04-071-1/+1
| | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | bugfix: segfault on startup if $actionqueuefilename was missing for disk queu...Tomas Heinrich2012-04-051-0/+3
| | * | | | | | | bugfix: segfault if disk-queue was started up with old queue fileTomas Heinrich2012-04-051-0/+2