summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Silence compiler warnings about unused parameters.Miloslav Trmač2012-08-261-0/+3
* Merge branch 'v6-stable'Rainer Gerhards2012-08-2523-110/+239
|\
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-08-2521-105/+193
| |\
| | * Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stableRainer Gerhards2012-08-253-30/+48
| | |\
| | | * change template.[ch] to ASL 2.0, removing a GPLv3-only patchRainer Gerhards2012-08-253-30/+48
| | * | preparing for 5.10.0 releaseRainer Gerhards2012-08-224-4/+11
| | * | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-08-221-2/+6
| | |\|
| | | * preparing for 5.8.13 releaseRainer Gerhards2012-08-223-3/+3
| | | * nit: forward-compatible default ruleset name as used in next versionRainer Gerhards2012-08-221-1/+1
| | * | small bugfix: stream timeout API use was incorrectRainer Gerhards2012-08-221-2/+2
| | * | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-08-226-18/+119
| | |\|
| | | * bugfix: multiple main queues with same queue file name were not detectedRainer Gerhards2012-08-223-3/+48
| | * | changed TRUE/FALSE to RSTRUE/RSFALSERainer Gerhards2012-08-2214-46/+45
| * | | Merge branch 'beta' into v6-stableRainer Gerhards2012-08-20211-11720/+15449
| |\ \ \
| | * | | nitfix: status indication (now: stable) was invalid in ChangeLogRainer Gerhards2012-08-201-1/+1
| | * | | Merge branch 'v5-stable' into betaRainer Gerhards2012-08-203-3/+61
| | |\ \ \ | | | | |/ | | | |/|
| | | * | nitfix: remove quirck in new debug message codeRainer Gerhards2012-08-011-4/+2
| | | * | more elaborate debug logging for object deserializerRainer Gerhards2012-08-011-0/+39
| | | * | undo last queue patch - caused a regressionRainer Gerhards2012-08-012-5/+1
| | | * | bugfix: potential abort if output plugin logged message during shutdownRainer Gerhards2012-08-012-7/+28
| | | * | bugfix: DA queue fixed handling of bad queue files.Andre Lorbach2012-07-312-1/+5
| | * | | preparing for 6.4.0 releaseRainer Gerhards2012-08-203-3/+6
| * | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-07-243-9/+10
| |\ \ \ \ | | | |/ / | | |/| |
* | | | | Fix printing of some template optionsMiloslav Trmač2012-08-211-1/+4
* | | | | doc: add imported patch to ChangeLogRainer Gerhards2012-08-211-0/+2
* | | | | Fix undefined ctxee problemMilan Bartos2012-08-211-2/+4
* | | | | update documentation for parsing trusted propertiesMilan Bartos2012-08-211-0/+2
* | | | | Add support for parsing trusted propertiesMilan Bartos2012-08-211-30/+121
* | | | | Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslogRainer Gerhards2012-08-022-1/+8
|\ \ \ \ \
| * \ \ \ \ Merge branch 'beta'Rainer Gerhards2012-08-012-1/+8
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | doc: add last patch to ChangelogRainer Gerhards2012-08-011-0/+3
| | * | | | fix problem with cutting first 16 characters from message with bAnnotate on m...Milan Bartos2012-08-011-1/+5
* | | | | | doc: added last patch to ChangeLogRainer Gerhards2012-07-311-0/+2
* | | | | | Fix $SystemLogSocketAnnotateMiloslav Trmač2012-07-311-3/+2
|/ / / / /
* | | | | imzmq3: Added the return call to runInputDavid Kelly2012-07-311-0/+1
* | | | | BAT-40 Found leak in imzmq3 pluginDavid Kelly2012-07-311-1/+4
* | | | | doc: improved doc for built-in modulesFlorian Riedl2012-07-247-24/+443
* | | | | Merge branch 'beta'Rainer Gerhards2012-07-2410-60/+257
|\| | | |
| * | | | bugfix: imptcp aborted when $InputPTCPServerBindRuleset was usedRainer Gerhards2012-07-242-1/+2
| * | | | Merge branch 'v5-stable' into betaRainer Gerhards2012-07-243-9/+10
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | omelasticsearch: regression from "parent" feature could case abortsRainer Gerhards2012-07-111-23/+26
| * | | | bugfix: imtcp aborted when more than 2 connections were used.Andre Lorbach2012-07-114-3/+6
| * | | | omelasticsearch: support for parameters parent & dynparent addedRainer Gerhards2012-07-102-20/+98
| * | | | omelasticsearch: implement retry via request to es server homepageRainer Gerhards2012-07-101-10/+60
| * | | | omelasticsearch: better debug instrumentationRainer Gerhards2012-07-092-17/+33
| * | | | debug log: cleaned up & streamlined queue param outputRainer Gerhards2012-07-051-20/+43
| * | | | debug log: emit (some) action queue parameters to debug logRainer Gerhards2012-07-053-3/+28
| * | | | preparing for 6.3.12v6.3.12Rainer Gerhards2012-07-023-5/+3
* | | | | Merge branch 'v5-stable'Rainer Gerhards2012-07-243-9/+10
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | bugfix: strm class could abort under some circumstancesRainer Gerhards2012-07-241-6/+4