summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\| | |
| | * | | Merge branch 'beta' of git+ssh://git.adiscon.com/git/rsyslog into betaRainer Gerhards2012-06-291-1/+1
| | |\ \ \
| | | * \ \ Merge branch 'beta' of git+ssh://git.adiscon.com/git/rsyslog into betaAndre Lorbach2012-06-280-0/+0
| | | |\ \ \
| | | * \ \ \ Merge branch 'v6-stable' into betaAndre Lorbach2012-06-281-1/+1
| | | |\ \ \ \
| | * | | | | | imklog: cleanup of no longer used codeRainer Gerhards2012-06-292-32/+0
| | |/ / / / /
| * | | | | | imklog: support for module() global config parameters addedRainer Gerhards2012-06-292-58/+116
| * | | | | | immark: support for module() global config parameters addedRainer Gerhards2012-06-272-4/+67
| * | | | | | imuxsock: support for module() global config parameters addedRainer Gerhards2012-06-271-47/+128
| * | | | | | $actionname was not properly set via legacy directiveRainer Gerhards2012-06-271-4/+0
| * | | | | | provide support to dynamically enable/disable legacy conf commandRainer Gerhards2012-06-265-24/+55
| * | | | | | imudp: support for module() global config parameters addedRainer Gerhards2012-06-262-64/+71
| * | | | | | impstats: support for module() global config parameters addedRainer Gerhards2012-06-261-25/+103
| * | | | | | modules: call new-style entry point only when new-style stmt is usedRainer Gerhards2012-06-261-2/+4
| * | | | | | omudpspoof: support for module() global config parameters addedRainer Gerhards2012-06-251-6/+132
| * | | | | | omudpspoof: remove actually not existing compresion level paramRainer Gerhards2012-06-251-5/+0
| * | | | | | omuxsock: support for module() global config parameters addedRainer Gerhards2012-06-251-4/+128
| * | | | | | doc: typo fixRainer Gerhards2012-06-251-1/+1
| * | | | | | ompipe: fix copy&paste name errorsRainer Gerhards2012-06-251-3/+3
| * | | | | | omfwd: support for module() global config parameters addedRainer Gerhards2012-06-251-8/+127
| * | | | | | ompipe: support for module() global config parameters addedRainer Gerhards2012-06-252-5/+107
| * | | | | | a bit more cleanupRainer Gerhards2012-06-251-5/+2
| * | | | | | cleanup & fix of mini-leakRainer Gerhards2012-06-252-5/+3
| * | | | | | implemented freeCnf() module interface & fixed some mem leaksRainer Gerhards2012-06-2512-37/+90
| * | | | | | milestone: module() config statement basically worksRainer Gerhards2012-06-218-41/+220
| * | | | | | milestone: module() can load module in legacy modeRainer Gerhards2012-06-206-13/+65
* | | | | | | Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslogAndre Lorbach2012-06-280-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'beta'Charlie Root2012-06-281-1/+1
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
* | | | | | | | Merge branch 'beta'Andre Lorbach2012-06-281-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | Merge branch 'v6-stable' into betaCharlie Root2012-06-281-1/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | / / / | | | |/ / / | | |/| | |
| | * | | | Added dragonfly to configure.acBartosz Kuzma2012-06-271-1/+1
* | | | | | Merge branch 'beta'Rainer Gerhards2012-06-275-37/+8
|\| | | | | | |_|/ / / |/| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-15 16:07:57 +0000