summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add support for optional JSON fieldsHEADommongodbMiloslav Trmač2012-08-284-0/+18
* Handle $!all-json in field templatesMiloslav Trmač2012-08-283-28/+97
* Send fields specified by a template to mongodb.Miloslav Trmač2012-08-282-20/+24
* Implement ACT_FIELDS_PASSING, test in mongodbMiloslav Trmač2012-08-285-7/+166
* Add OMSR_TPL_AS_FIELDS mode for output modules.Miloslav Trmač2012-08-285-5/+16
* Merge branch 'master-uuid'Rainer Gerhards2012-08-276-4/+89
|\
| * made new uuid property threadsafeRainer Gerhards2012-08-262-15/+25
| * add uuid property to message objectJérôme Renard2012-08-265-4/+79
* | Merge branch 'master-newtemplate'Rainer Gerhards2012-08-278-15/+695
|\ \ | |/ |/|
| * add capability to configure outname for constant (inside template)Rainer Gerhards2012-08-254-22/+15
| * milestone: LIST-type templates support full option setRainer Gerhards2012-08-252-5/+77
| * milestone: LIST-type template now only missing regex supportRainer Gerhards2012-08-251-0/+41
| * milestone: LIST-type templates work, but no all options yet presentRainer Gerhards2012-08-254-13/+291
| * milestone: base plumbing for LIST-type templates mostly in placeRainer Gerhards2012-08-255-18/+106
| * Merge branch 'master' into master-newtemplateRainer Gerhards2012-08-2523-109/+238
| |\
| * | 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 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