summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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 '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 betaCharlie Root2012-06-281-1/+1
| | |\ \ \
| * | \ \ \ Merge branch 'v6-stable' into betaAndre Lorbach2012-06-281-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | Added dragonfly to configure.acBartosz Kuzma2012-06-271-1/+1
* | | | | imklog: cleanup of no longer used codeRainer Gerhards2012-06-292-32/+0
|/ / / /
* | | | cleanup: remove config scoping system left-overRainer Gerhards2012-06-272-30/+0
* | | | improve invalid config command error messageRainer Gerhards2012-06-271-1/+2
* | | | bugfix: $ActionName was not properly honoredRainer Gerhards2012-06-272-4/+4
* | | | preparing for 6.3.11v6.3.11Rainer Gerhards2012-06-183-3/+3
* | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-06-152-12/+7
|\| | |
| * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-06-154-13/+10
| |\ \ \
| | * | | bugfix: randomized IP option header in omudpspoof caused problemsRainer Gerhards2012-06-152-13/+5
| | * | | adding pkgconfigdir definition to Makefile.am to help build properlyAbby Edwards2012-06-131-0/+2
| | * | | bugfix "$PreserveFQDN on" was not honored in some modulesRainer Gerhards2012-06-122-0/+3
* | | | | bugfix: small memory leak in imptcp (static after config read)Rainer Gerhards2012-06-141-1/+2
* | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-06-1413-1/+1552
|\| | | |
| * | | | preparing for 6.2.2 releasev6.2.2Rainer Gerhards2012-06-133-3/+5
| * | | | added rpm spec files for rhel / centosAbby Edwards2012-06-1312-0/+1549
* | | | | adding pkgconfigdir definition to Makefile.am to help build properlyAbby Edwards2012-06-131-0/+2
* | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-06-112-4/+38
|\| | | |
| * | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-06-113-5/+15
| |\| | |
| | * | | bugfix: "last message repeated n times" message was missing hostnameRainer Gerhards2012-06-113-5/+13
| * | | | bugfix: did not compile under solaris due to $uptime property codeRainer Gerhards2012-06-082-0/+7
| * | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-06-067-34/+62
| |\| | |
* | | | | bugfix: expression-based filters with AND/OR could segfaultRainer Gerhards2012-06-112-2/+12
* | | | | Merge branch 'v5-beta' into betaRainer Gerhards2012-06-067-34/+62
|\ \ \ \ \
| * \ \ \ \ Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-067-34/+62
| |\ \ \ \ \ | | | |/ / / | | |/| | |