summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Merge branch 'v6-stable' into tmpRainer Gerhards2012-11-222-0/+5
| |\| |
| | * | bugfix: hostname set in rsyslog.conf was not picked up until HUPoxpa2012-11-222-0/+5
* | | | typo fixRainer Gerhards2012-11-221-1/+1
* | | | Merge branch 'v7-stable'Rainer Gerhards2012-11-221-15/+23
|\| | |
| * | | typo fixRainer Gerhards2012-11-221-3/+3
| * | | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-11-221-12/+20
| |\| |
| | * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-11-221-12/+20
| | |\|
| | | * typo correctionRainer Gerhards2012-11-221-5/+5
* | | | doc: add new options to imklog doc pageMarius Tomaschewski2012-11-221-21/+19
* | | | Merge branch 'v7-stable'Rainer Gerhards2012-11-2221-52/+187
|\| | |
| * | | doc: mention imported patches in ChangeLogRainer Gerhards2012-11-221-2/+12
| * | | Merge branch 'v6-stable' into tmpRainer Gerhards2012-11-225-28/+97
| |\| |
| | * | 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
| * | | prepare for 7.2.3 releasev7.2.3Rainer Gerhards2012-11-213-3/+3
| * | | testbench: bug fix & enhance $IncludeConfig testsRainer Gerhards2012-11-2010-10/+8
| * | | improve $IncludeConfig error messagesRainer Gerhards2012-11-203-4/+31
| * | | document fixed regressionRainer Gerhards2012-11-201-0/+12
| * | | regression fix: rsyslog terminated when wild-card $includeFile did not find f...Rainer Gerhards2012-11-201-2/+5
| * | | cleanupRainer Gerhards2012-11-201-1/+0
| * | | prepare 7.2.2 releasev7.2.2Rainer Gerhards2012-11-164-5/+5
| * | | refactor stream.h; fix some issues with last patchRainer Gerhards2012-11-153-26/+18
| * | | minor cleanupRainer Gerhards2012-11-151-8/+0
| * | | bugfix: imfile discarded some file partsMilan Bartos2012-11-152-3/+32
* | | | Merge branch 'master-newqueue'Rainer Gerhards2012-11-195-67/+105
|\ \ \ \
| * | | | queue: file delete stream does no longer do real ioRainer Gerhards2012-11-195-67/+105
* | | | | Merge branch 'v7-stable'Rainer Gerhards2012-11-1414-26/+65
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | bugfix: potential segfault at startup with property-based filterRainer Gerhards2012-11-143-2/+9
| * | | | bugfix: garbled message if field name was used with jsonf property optionRainer Gerhards2012-11-142-2/+7
| * | | | silence compiler warnings & some cleanupRainer Gerhards2012-11-143-7/+4
| * | | | doc: describe leading space problem with "startswith" comparisonRainer Gerhards2012-11-142-3/+9
| * | | | bugfix: invalid formatting of man pagebjarniig@rhi.hi.is2012-11-141-4/+4
| * | | | bugfix: very small memory leak in imrelpRainer Gerhards2012-11-141-0/+7
| * | | | bugfix: make rsyslog compile on kfreebsd againGuillem Jover2012-11-144-3/+8
| * | | | Fix the rsyslogd man page formatting for the -d flagGeorgi Georgiev2012-11-141-1/+1
| * | | | make sure inaccessible config file is not tried to be processedRainer Gerhards2012-11-141-3/+3
| * | | | Silently ignore wildcard includes that match nothingGeorgi Georgiev2012-11-131-4/+16
* | | | | Merge branch 'v7-stable'Rainer Gerhards2012-11-135-99/+232
|\| | | |
| * | | | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-11-132-1/+5
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | 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
| * | | | doc: upgrade ruleset doc to v7 config systemKonstantin Schmitt2012-11-123-98/+227
* | | | | Merge branch 'v7-stable'Rainer Gerhards2012-11-0914-42/+134
|\| | | |
| * | | | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-11-0911-18/+90
| |\| | |
| | * | | bugfix: $IncludeConfig did not correctly process directoriesRainer Gerhards2012-11-0911-20/+86
| * | | | cleanup: remove no longer needed configure settingRainer Gerhards2012-11-091-21/+0