summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-162-9/+11
|\
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-162-8/+10
| |\
| | * bugfix: imuxsock truncated head of received messageRainer Gerhards2012-10-162-8/+6
| | * fix problem with cutting first 16 characters from message with bAnnotate on m...Milan Bartos2012-10-101-1/+5
| * | doc: fix minor small but important typo in ChangeLogRainer Gerhards2012-10-161-1/+1
* | | Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-112-1/+7
|\| |
| * | change lumberjack cookie to "@cee" from "@cee "Rainer Gerhards2012-10-112-1/+7
* | | preparing for 6.5.1 releasev6.5.1Rainer Gerhards2012-10-113-3/+3
* | | remove some assert()'s - valgrind does a better job...Rainer Gerhards2012-10-111-4/+0
* | | fix small memory leak with string-type templatesRainer Gerhards2012-10-111-0/+1
* | | fix small memory leak when template is specified in omfileRainer Gerhards2012-10-111-0/+1
* | | re-enabled commented-out serialization support in debug handlerRainer Gerhards2012-10-111-3/+3
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-045-29/+2
|\| |
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-044-27/+1
| |\|
| | * remove cust1 dummy plugin from build systemRainer Gerhards2012-10-044-27/+1
| * | build: don't include librsyslog.la in the dist tarballMichael Biebl2012-10-041-2/+1
* | | 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
| |\| |