summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | 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
| * | | | cleanupRainer Gerhards2012-11-091-7/+7
| * | | | Merge branch 'v7.2.1-bugfix' into v7-stableRainer Gerhards2012-11-092-1/+8
| |\ \ \ \
| | * | | | bugfix: potential segfault due to invalid param handling in comparisonsRainer Gerhards2012-11-082-1/+8
| * | | | | enabled to build without libuuid, at loss of uuid functionalityRainer Gerhards2012-11-094-2/+36
* | | | | | Merge branch 'v7-stable'Rainer Gerhards2012-11-081-1/+1
|\| | | | |
| * | | | | doc: $ActionQueueDiscardSeverity had wrong default documentedRainer Gerhards2012-11-081-1/+1
* | | | | | doc: mention imported patches in ChangeLogRainer Gerhards2012-11-081-0/+6
* | | | | | Merge branch 'v7-stable'Rainer Gerhards2012-11-083-8/+21
|\| | | | | | |_|_|_|/ |/| | | |
| * | | | doc: mention imported patch in ChangeLogRainer Gerhards2012-11-081-0/+1
| * | | | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-11-082-1/+3
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | bugfix: no error msg on invalid field option in legacy/string templateRainer Gerhards2012-11-082-1/+3
| * | | | bugfixes in string-type template()SRainer Gerhards2012-11-082-5/+13
| * | | | Added imkmsg^imklog to imkmsg documentation.Milan Bartos2012-11-051-2/+4
* | | | | prepare for 7.3.3 releasev7.3.3Rainer Gerhards2012-11-073-5/+8
* | | | | bugfix: property tTIMESTAMP was incorrectly restoredRainer Gerhards2012-11-071-1/+1
* | | | | cleanup: remove no longer needed functionRainer Gerhards2012-11-062-87/+0
* | | | | queue: reduce CPU load for deserializing message propertiesRainer Gerhards2012-11-066-23/+226
* | | | | doc: improve ommongodb docRainer Gerhards2012-11-062-0/+61
* | | | | queue: mini-improvement in deserializer (stage work)Rainer Gerhards2012-11-053-5/+5
* | | | | very minimal improvement in reconstructing persisted queue entriesRainer Gerhards2012-11-051-6/+4
* | | | | improve debug logging a bitRainer Gerhards2012-11-051-4/+3
* | | | | bugfix: dynafile zip files could be corruptedRainer Gerhards2012-11-052-9/+13
* | | | | queue: handle unknown queue type in debug outputRainer Gerhards2012-11-031-0/+3