summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge branch 'v7-stable'Rainer Gerhards2012-12-131-1/+1
|\| | |
| * | | build: link omelasticsearch against -lmMichael Biebl2012-12-131-1/+1
* | | | Merge branch 'v7-stable-newmsglock' into master-newmsglockRainer Gerhards2012-12-061-3/+7
|\| | |
| * | | permit RFC3339 timestamp in local log socket messagesSebastien Ponce2012-12-031-3/+7
* | | | bugfix[minor]: invalid error code when mmnormalize could not access rulebaseRainer Gerhards2012-11-301-3/+3
* | | | bugfix: segfault on imuxsock startup if system log socket is used and no rate...Rainer Gerhards2012-11-291-0/+4
* | | | bugfix: mmnormalize could abort rsyslog if config parameter was in errorRainer Gerhards2012-11-281-1/+5
* | | | Merge branch 'v7-stable'Rainer Gerhards2012-11-2811-5/+21
|\| | |
| * | | silence some primarily cosmetic compiler warning messagesRainer Gerhards2012-11-282-3/+12
| * | | bugfix: modules not (yet) supporting new conf format were not properly regist...Rainer Gerhards2012-11-289-1/+10
| * | | bugfix: supportoctetcountedframing parameter did not work in imptcpRainer Gerhards2012-11-251-1/+1
* | | | bugfix: mmnormalize build problemsRainer Gerhards2012-11-271-6/+3
* | | | Merge branch 'v7-stable'Rainer Gerhards2012-11-223-17/+37
|\| | |
| * | | Merge branch 'v6-stable' into tmpRainer Gerhards2012-11-223-25/+49
| |\| |
| | * | imklog: add new config params to module() parameter setRainer Gerhards2012-11-221-0/+6
| | * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-11-223-25/+43
| | |\|
| | | * bugfix: imklog mistakenly took kernel timestamp subseconds as nanosecondsRainer Gerhards2012-11-221-12/+12
| | | * imklog: added $klogParseKernelTimestamp optionMarius Tomaschewski2012-11-213-0/+7
| | | * imklog: added $klogKeepKernelTimestamp optionMarius Tomaschewski2012-11-213-2/+8
| * | | minor cleanupRainer Gerhards2012-11-151-8/+0
* | | | Merge branch 'v7-stable'Rainer Gerhards2012-11-143-5/+10
|\| | |
| * | | silence compiler warnings & some cleanupRainer Gerhards2012-11-141-5/+1
| * | | bugfix: very small memory leak in imrelpRainer Gerhards2012-11-141-0/+7
| * | | bugfix: make rsyslog compile on kfreebsd againGuillem Jover2012-11-141-0/+2
* | | | Merge branch 'v7-stable'Rainer Gerhards2012-11-131-1/+1
|\| | |
| * | | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-11-131-1/+1
| |\| |
| | * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-11-131-1/+1
| | |\|
| | | * imuxsock: do not log EAGAIN in nonblocking recvfromMarius Tomaschewski2012-11-131-1/+1
* | | | Merge branch 'v7-stable'Rainer Gerhards2012-11-021-3/+3
|\| | |
| * | | bugfix: potential abort of imtcp on rsyslogd shutdownRainer Gerhards2012-11-021-3/+3
| * | | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-11-018-8/+8
| |\| |
| | * | bugfix: invalid rsyslog-internal macro API useRainer Gerhards2012-11-018-8/+8
* | | | Merge branch 'v7-stable'Rainer Gerhards2012-11-012-3/+5
|\| | |
| * | | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-11-011-1/+1
| |\| |
| | * | bugfix: misaddressing of $mmnormalizeuserawmsg parameterRainer Gerhards2012-11-011-1/+1
| | * | Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-191-2/+2
| | |\ \
| | * \ \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-191-5/+0
| | |\ \ \
| | * \ \ \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-172-3/+5
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-161-8/+2
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-111-1/+1
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-041-6/+0
| | |\ \ \ \ \ \ \
| * | | | | | | | | bugfix: imzmq3 segfault with PULL subscriptionMartin Nilsson2012-10-301-2/+4
* | | | | | | | | | mmnormalize: support for v6+ config interface addedRainer Gerhards2012-11-011-29/+145
* | | | | | | | | | mmjsonparse: support for v6+ config interface addedRainer Gerhards2012-11-011-5/+46
* | | | | | | | | | bugfix: invalid rsyslog-internal macro API useRainer Gerhards2012-11-018-8/+8
* | | | | | | | | | Merge branch 'master-ratelimit'Rainer Gerhards2012-10-3012-165/+139
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | remove legacy API parseAndSubmitMessage() from imrelpRainer Gerhards2012-10-291-3/+21
| * | | | | | | | | | Merge branch 'master' into master-ratelimitRainer Gerhards2012-10-241-13/+18
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | imuxsock: use a default ratelimiter if none else appliesRainer Gerhards2012-10-231-1/+9
| * | | | | | | | | | | imklog, impstats: support for new rate-limiting API addedRainer Gerhards2012-10-192-6/+5