summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | 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
| * | | | bugfix: DA queue could cause abortRainer Gerhards2012-07-242-3/+6
* | | | | Merge branch 'v5-beta'Rainer Gerhards2012-07-240-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-154-13/+10
| |\ \ \ \ | | |/ / /
* | | | | bugfix: omhdfs did no longer compileRainer Gerhards2012-07-112-1/+2
* | | | | Merge branch 'beta'Rainer Gerhards2012-06-297-52/+387
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | cosmetic: added info about omelasticsearch to ChangeLogRainer Gerhards2012-06-291-0/+7
| * | | | Merge branch 'master-elasticsearch' into tmpRainer Gerhards2012-06-296-52/+380
| |\ \ \ \
| | * | | | omelasticsearch: bugfix: bulkmode setting was not properly initializedRainer Gerhards2012-06-131-0/+1
| | * | | | omelasticsearch: dyn index&type now also supported in bulk modeRainer Gerhards2012-05-281-4/+7
| | * | | | omelasticsearc: milestone, bulk insert basically worksRainer Gerhards2012-05-251-50/+65
| | * | | | omelasticsearch: test commit, first shot at bulk interfaceRainer Gerhards2012-05-251-11/+85
| | * | | | omelasticsearch: added transactional interface & better debug outputRainer Gerhards2012-05-243-3/+39
| | * | | | property replacer lost one char when json escaping was necessaryRainer Gerhards2012-05-211-1/+1
| | * | | | omelasticsearch: provide authentication support (UNTESTED)Rainer Gerhards2012-04-252-0/+29
| | * | | | Merge branch 'master' into master-elasticsearchRainer Gerhards2012-04-2339-316/+825
| | |\ \ \ \
| | * | | | | omelasticsearch: added asnycRepl and timeout config paramsRainer Gerhards2012-04-161-3/+26
| | * | | | | omelasticsearch: permit dynamic index/type parameters (just like dynafile)Rainer Gerhards2012-04-131-16/+107
| | * | | | | permitting plugins to use three string requestsRainer Gerhards2012-04-132-4/+8
| | * | | | | imuxsock: mini bugfix: closed fd was tried to close second timeRainer Gerhards2012-04-131-3/+6
| | * | | | | omelasticsearch: used new property replacer options for default templateRainer Gerhards2012-04-051-1/+1
| | * | | | | omelasticsearch: moved to v6 config systemRainer Gerhards2012-04-051-35/+91
* | | | | | | Merge branch 'master-module'Rainer Gerhards2012-06-2932-345/+1373
|\ \ \ \ \ \ \
| * | | | | | | imklog: removal of no longer needed config directivesRainer Gerhards2012-06-292-37/+6
| * | | | | | | Merge branch 'beta' into master-moduleRainer Gerhards2012-06-296-38/+7
| |\ \ \ \ \ \ \ | | |/ / / / / /