summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | v6 config/templates: legacy types are now supported via template()Rainer Gerhards2012-08-253-3/+180
| * | | | | add base plumbing for template() config object to grammarRainer Gerhards2012-08-244-2/+33
* | | | | | Merge branch 'v6-stable'Rainer Gerhards2012-08-262-1/+13
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | doc: add incompatible patch info to ChangeLogRainer Gerhards2012-08-261-0/+12
| * | | | | INCOMPATIBLE: Return {} for missing $!all-jsonMiloslav Trmač2012-08-261-1/+1
| * | | | | INCOMPATIBLE: use :, not =, as separator for jsonfMiloslav Trmač2012-08-262-2/+2
| * | | | | Remove a no-effect ", NULL";Miloslav Trmač2012-08-261-1/+1
| * | | | | Fix printing of some template optionsMiloslav Trmač2012-08-261-1/+4
| * | | | | cleanup: remove left-over commented-out codeRainer Gerhards2012-08-251-10/+0
* | | | | | INCOMPATIBLE: use :, not =, as separator for jsonfMiloslav Trmač2012-08-262-2/+2
| |_|_|/ / |/| | | |
* | | | | Remove a no-effect ", NULL";Miloslav Trmač2012-08-261-1/+1
* | | | | 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 releasev5.10.0Rainer Gerhards2012-08-224-4/+11
| | * | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-08-221-2/+6
| | |\|
| | | * preparing for 5.8.13 releasev5.8.13Rainer 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 ChangeLogv6.4.0Rainer 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-stablev6.2.2.with.unreleased.fixesRainer 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