summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-044-0/+32
|\
| * doc: add missing files to distribution tarballRainer Gerhards2012-10-041-0/+15
| * bugfix: comments inside objects (e.g. action()) were not properly handledRainer Gerhards2012-10-042-0/+2
| * cosmetic: add few files to .gitignoreRainer Gerhards2012-10-041-0/+15
* | integrate logctl into build processRainer Gerhards2012-10-024-456/+482
* | add new tool "logctl" to access lumberjack logs in MongoDBUlrike Gerhards2012-10-021-0/+456
* | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-022-1/+3
|\|
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-021-2/+2
| |\
| | * minor: disable debug support in complex1.sh testRainer Gerhards2012-10-021-2/+2
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-023-3/+5
| |\|
| | * cleanupRainer Gerhards2012-10-021-1/+1
| | * bugfix: fixed wrong bufferlength for snprintf in tcpflood.cAndre Lorbach2012-09-283-3/+5
* | | Merge branch 'v6-devel-input' into v6-develRainer Gerhards2012-09-288-153/+578
|\ \ \
| * | | doc: update module doc to new config formatFlorian Riedl2012-09-285-107/+373
| * | | imtcp: implement support for module() parametersRainer Gerhards2012-09-281-38/+135
| * | | imptcp: implement support for module() parametersRainer Gerhards2012-09-271-7/+70
| * | | fix whitespace issueRainer Gerhards2012-09-271-1/+0
* | | | Merge branch 'v6-devel-input' into v6-develRainer Gerhards2012-09-2716-244/+1173
|\| | |
| * | | Do not load module if it had errorneous parametersRainer Gerhards2012-09-273-12/+58
| * | | cosmetic: remove irrelevant compiler warningRainer Gerhards2012-09-271-1/+1
| * | | bugfix: config errors did not always cause statement to failRainer Gerhards2012-09-274-28/+114
| * | | imfile: implement support for module parameters via module() stmtRainer Gerhards2012-09-272-9/+80
| * | | yet another nitfix...Rainer Gerhards2012-09-271-1/+1
| * | | nitfixRainer Gerhards2012-09-271-2/+2
| * | | imfile: implement support for input()Rainer Gerhards2012-09-271-3/+78
| * | | milestone: port imfile to v6 config systemRainer Gerhards2012-09-262-149/+279
| * | | imrelp: implement support for input()Rainer Gerhards2012-09-261-10/+76
| * | | imudp: implement support for input()Rainer Gerhards2012-09-262-9/+84
| * | | imptcp: implement support for input()Rainer Gerhards2012-09-262-15/+119
| * | | cleanupRainer Gerhards2012-09-261-2/+0
| * | | imtcp: implement support for input()Rainer Gerhards2012-09-261-10/+89
| * | | cleanupRainer Gerhards2012-09-261-3/+0
| * | | Implement input() support in imuxsockRainer Gerhards2012-09-261-10/+119
| * | | Merge branch 'v6-stable' into v6-devel-inputRainer Gerhards2012-09-262-0/+9
| |\| |
| * | | input stmt: add core engine plumbingRainer Gerhards2012-09-265-1/+96
| * | | cleanupRainer Gerhards2012-09-261-2/+0
* | | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-262-0/+9
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-262-0/+9
| |\|
| | * enable DNS resolution in imrelpApollon Oikonomopoulos2012-09-262-0/+9
* | | minor cleanupRainer Gerhards2012-09-251-1/+0
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-231-7/+0
|\| |
| * | Remove no longer needed functionRainer Gerhards2012-09-231-5/+0
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-212-1/+5
|\| |
| * | Implemented different grammar for pri filtersRainer Gerhards2012-09-211-1/+1
| * | bugfix: some valid legacy PRI filters were flagged as errornousRainer Gerhards2012-09-212-1/+5
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-201-1/+1
|\| |
| * | SimplifyRainer Gerhards2012-09-201-4/+1
| * | Added missing iRet handler code into CheckConnection() in netstrm.cAndre Lorbach2012-09-201-1/+4
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-202-0/+8
|\| |
| * | doc: add last bugfix to ChangeLogRainer Gerhards2012-09-201-0/+5