summaryrefslogtreecommitdiffstats
path: root/runtime
Commit message (Expand)AuthorAgeFilesLines
* Add support for optional JSON fieldsHEADommongodbMiloslav Trmač2012-08-281-0/+8
* Handle $!all-json in field templatesMiloslav Trmač2012-08-282-0/+81
* Send fields specified by a template to mongodb.Miloslav Trmač2012-08-281-0/+1
* Implement ACT_FIELDS_PASSING, test in mongodbMiloslav Trmač2012-08-281-0/+1
* Add OMSR_TPL_AS_FIELDS mode for output modules.Miloslav Trmač2012-08-282-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
| | * | | undo last queue patch - caused a regressionRainer Gerhards2012-08-011-1/+1
| | * | | bugfix: DA queue fixed handling of bad queue files.Andre Lorbach2012-07-311-1/+1
* | | | | Merge branch 'beta'Rainer Gerhards2012-07-243-2/+50
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'v5-stable' into betaRainer Gerhards2012-07-242-9/+9
| |\ \ \ \ | | |/ / /
| * | | | omelasticsearch: better debug instrumentationRainer Gerhards2012-07-091-2/+0
| * | | | 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-052-0/+27
* | | | | Merge branch 'v5-stable'Rainer Gerhards2012-07-242-9/+9
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | bugfix: strm class could abort under some circumstancesRainer Gerhards2012-07-241-6/+4
| * | | | bugfix: DA queue could cause abortRainer Gerhards2012-07-241-3/+5
| | |_|/ | |/| |
* | | | Merge branch 'beta'Rainer Gerhards2012-06-293-2/+3
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master-elasticsearch' into tmpRainer Gerhards2012-06-293-2/+3
| |\ \ \
| | * | | property replacer lost one char when json escaping was necessaryRainer Gerhards2012-05-211-1/+1
| | * | | omelasticsearch: provide authentication support (UNTESTED)Rainer Gerhards2012-04-251-0/+1
| | * | | Merge branch 'master' into master-elasticsearchRainer Gerhards2012-04-2312-159/+438
| | |\ \ \
| | * | | | permitting plugins to use three string requestsRainer Gerhards2012-04-132-4/+8
| | * | | | omelasticsearch: used new property replacer options for default templateRainer Gerhards2012-04-051-1/+1
| * | | | | improve invalid config command error messageRainer Gerhards2012-06-271-1/+2