summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-11-221-12/+20
|\
| * typo correctionRainer Gerhards2012-11-221-5/+5
* | imklog: add new config params to module() parameter setRainer Gerhards2012-11-221-0/+6
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-11-225-28/+91
|\|
| * bugfix: imklog mistakenly took kernel timestamp subseconds as nanosecondsRainer Gerhards2012-11-222-12/+27
| * imklog: added $klogParseKernelTimestamp optionMarius Tomaschewski2012-11-214-1/+16
| * imklog: added $klogKeepKernelTimestamp optionMarius Tomaschewski2012-11-214-2/+13
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-11-132-1/+5
|\|
| * add "EAGAIN" patch to ChangeLogRainer Gerhards2012-11-131-0/+4
| * imuxsock: do not log EAGAIN in nonblocking recvfromMarius Tomaschewski2012-11-131-1/+1
* | bugfix: $IncludeConfig did not correctly process directoriesRainer Gerhards2012-11-0911-20/+86
* | bugfix: no error msg on invalid field option in legacy/string templateRainer Gerhards2012-11-082-1/+3
* | doc: add recent patch (API) to ChangeLogRainer Gerhards2012-11-011-0/+3
* | bugfix: invalid rsyslog-internal macro API useRainer Gerhards2012-11-0110-10/+10
* | bugfix: misaddressing of $mmnormalizeuserawmsg parameterRainer Gerhards2012-11-012-1/+5
* | bugfix: build problems on some platformsRainer Gerhards2012-10-262-1/+4
* | doc: fix html formattingMichael Biebl2012-10-251-2/+1
* | preparing for 6.6.0v6.6.0Rainer Gerhards2012-10-225-7/+10
* | Merge branch 'v6-beta' into v6-stableRainer Gerhards2012-10-2288-935/+7279
|\ \
| * \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-192-4/+4
| |\ \
| * | | doc: add imported bugfix to ChangeLogRainer Gerhards2012-10-191-0/+3
| * | | Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-192-5/+1
| |\ \ \
| * \ \ \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-176-45/+22
| |\ \ \ \
| * \ \ \ \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-162-9/+11
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'v6-stable' into v6-betaRainer 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 'v6-stable' into v6-develRainer Gerhards2012-10-044-0/+32
| |\ \ \ \ \ \ \ \
| * | | | | | | | | 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 '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