summaryrefslogtreecommitdiffstats
path: root/runtime
Commit message (Expand)AuthorAgeFilesLines
* cleanupRainer Gerhards2012-09-261-2/+0
* cleanupRainer Gerhards2012-09-261-3/+0
* input stmt: add core engine plumbingRainer Gerhards2012-09-265-1/+96
* minor cleanupRainer Gerhards2012-09-251-1/+0
* Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-231-7/+0
|\
| * Remove no longer needed functionRainer Gerhards2012-09-231-5/+0
* | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-201-1/+1
|\|
| * SimplifyRainer Gerhards2012-09-201-4/+1
| * Added missing iRet handler code into CheckConnection() in netstrm.cAndre Lorbach2012-09-201-1/+4
* | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-201-0/+3
|\|
| * Fix missing Sysklogd templateMilan Bartos2012-09-201-0/+3
* | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-141-1/+1
|\|
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-141-1/+1
| |\
| | * Debug logging slightly improvedRainer Gerhards2012-09-141-1/+1
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-131-78/+83
|\| |
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-131-78/+83
| |\|
| | * bugfix: invalid property name in property-filter could cause abortRainer Gerhards2012-09-131-56/+63
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-066-10/+33
|\| |
| * | Fixed TCP CheckConnection handling in omfwd.c.Andre Lorbach2012-08-255-8/+17
| * | bugfix: omusrsmsg incorrect return state & config warning handlingRainer Gerhards2012-08-281-2/+16
* | | default outname for $!<property> is now without $! prefixRainer Gerhards2012-08-291-2/+2
* | | adapted Mirek's changes to new JSON passing modeRainer Gerhards2012-08-291-0/+1
* | | add OMSR_TPL_AS_JSON mode for output modules (interface only)Rainer Gerhards2012-08-292-4/+6
* | | Merge branch 'master-uuid'Rainer Gerhards2012-08-273-3/+69
|\ \ \
| * | | made new uuid property threadsafeRainer Gerhards2012-08-261-15/+21
| * | | add uuid property to message objectJérôme Renard2012-08-263-3/+63
* | | | Merge branch 'master-newtemplate'Rainer Gerhards2012-08-272-3/+15
|\ \ \ \ | |/ / / |/| | |
| * | | add capability to configure outname for constant (inside template)Rainer Gerhards2012-08-251-2/+2
| * | | milestone: LIST-type templates work, but no all options yet presentRainer Gerhards2012-08-251-5/+6
| * | | milestone: base plumbing for LIST-type templates mostly in placeRainer Gerhards2012-08-251-0/+1
| * | | Merge branch 'master' into master-newtemplateRainer Gerhards2012-08-2510-34/+71
| |\ \ \
| * | | | v6 config/templates: legacy types are now supported via template()Rainer Gerhards2012-08-251-2/+2
| * | | | add base plumbing for template() config object to grammarRainer Gerhards2012-08-241-0/+10
* | | | | Merge branch 'v6-stable'Rainer Gerhards2012-08-261-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | INCOMPATIBLE: Return {} for missing $!all-jsonMiloslav Trmač2012-08-261-1/+1
| * | | | INCOMPATIBLE: use :, not =, as separator for jsonfMiloslav Trmač2012-08-261-1/+1
* | | | | INCOMPATIBLE: use :, not =, as separator for jsonfMiloslav Trmač2012-08-261-1/+1
| |_|/ / |/| | |
* | | | Merge branch 'v6-stable'Rainer Gerhards2012-08-2510-34/+71
|\| | | | |/ / |/| |
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-08-259-34/+34
| |\|
| | * Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stableRainer Gerhards2012-08-251-0/+2
| | |\
| | | * change template.[ch] to ASL 2.0, removing a GPLv3-only patchRainer Gerhards2012-08-251-0/+2
| | | * 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-224-14/+50
| | |\|
| | | * bugfix: multiple main queues with same queue file name were not detectedRainer Gerhards2012-08-221-2/+4
| | * | changed TRUE/FALSE to RSTRUE/RSFALSERainer Gerhards2012-08-227-27/+26
| | * | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-111-4/+8
| | |\ \
| * | \ \ Merge branch 'v5-stable' into betaRainer Gerhards2012-08-201-0/+37
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | 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