summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v6-stable' into betaRainer Gerhards2012-10-111-0/+12
|\
| * change lumberjack cookie to "@cee" from "@cee "Rainer Gerhards2012-10-112-1/+7
* | Don't require the trailing space in @cee: cookieMiloslav Trmač2012-10-111-1/+1
* | doc: add last patch to ChangeLogRainer Gerhards2012-10-111-0/+2
* | Fix crash when date properties are used without a templateMiloslav Trmač2012-10-111-2/+11
* | add deprecated note to discard actionRainer Gerhards2012-10-113-1/+25
* | added deprecated note to omrulesetRainer Gerhards2012-10-113-0/+10
* | make omruleset non-default in ./configureRainer Gerhards2012-10-111-1/+1
* | preparing for 7.1.10 releasev7.1.10Rainer Gerhards2012-10-112-2/+2
* | fix regression introduced by last commitRainer Gerhards2012-10-111-1/+1
* | bugfixes in regards to action()Rainer Gerhards2012-10-112-0/+4
* | bugfix: some config processing warning messages were treated as errorsRainer Gerhards2012-10-112-2/+7
* | cosmetic: simplifyRainer Gerhards2012-10-111-3/+1
* | fix double-freeRainer Gerhards2012-10-111-1/+1
* | add missing prototypeRainer Gerhards2012-10-111-0/+1
* | remove some assert()'s - valgrind does a better job...Rainer Gerhards2012-10-111-4/+0
* | mention recent changes in ChangeLogRainer Gerhards2012-10-111-1/+6
* | fix small memory leak when template is specified in omfileRainer Gerhards2012-10-111-0/+1
* | fix small memory leak with string-type templatesRainer Gerhards2012-10-111-0/+1
* | cosmetic cleanupRainer Gerhards2012-10-091-3/+1
* | prepare for 7.1.9 releasev7.1.9Rainer Gerhards2012-10-093-4/+4
* | bugfix: in (non)equal comparisons the position of arrays influenced resultRainer Gerhards2012-10-092-1/+22
* | re-delete cust1.c plugin dummy fileRainer Gerhards2012-10-041-0/+0
* | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-045-28/+2
|\|
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-044-27/+1
| |\
| | * remove cust1 dummy plugin from build systemRainer Gerhards2012-10-044-27/+1
| * | build: don't include librsyslog.la in the dist tarballMichael Biebl2012-10-041-2/+1
* | | doc: add missing files to distribution tarballRainer Gerhards2012-10-042-0/+6
* | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-044-0/+32
|\| |
| * | doc: add missing files to distribution tarballRainer Gerhards2012-10-041-0/+15
| * | bugfix: comments inside objects (e.g. action()) were not properly handledRainer Gerhards2012-10-042-0/+2
| * | cosmetic: add few files to .gitignoreRainer Gerhards2012-10-041-0/+15
* | | prepare for 7.1.8 releasev7.1.8Rainer Gerhards2012-10-023-6/+6
* | | add "parser" parameter to ruleset(), so that parser chain can be configuredRainer Gerhards2012-10-024-8/+35
* | | get rid of compiler warningRainer Gerhards2012-10-021-4/+0
* | | cleanupRainer Gerhards2012-10-021-3/+0
* | | mmjsonparse: also add MSG part of message if CEE-parsing failsRainer Gerhards2012-10-022-10/+11
* | | Change mmjsonparse so non-json messages doesn't get lost from ceelogMilan Bartos2012-10-021-0/+9
* | | Merge branch 'v6-devel'Rainer Gerhards2012-10-024-0/+482
|\ \ \
| * | | integrate logctl into build processRainer Gerhards2012-10-024-456/+482
| * | | add new tool "logctl" to access lumberjack logs in MongoDBUlrike Gerhards2012-10-021-0/+456
* | | | Merge branch 'v6-devel'Rainer Gerhards2012-10-022-1/+3
|\| | |
| * | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-022-1/+3
| |\| |
| | * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-021-2/+2
| | |\|
| | | * minor: disable debug support in complex1.sh testRainer Gerhards2012-10-021-2/+2
| | * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-023-3/+5
| | |\|
| | | * cleanupRainer Gerhards2012-10-021-1/+1
| | | * bugfix: fixed wrong bufferlength for snprintf in tcpflood.cAndre Lorbach2012-09-283-3/+5
* | | | minor: mention better doc in ChangeLogRainer Gerhards2012-10-021-0/+1
* | | | doc: update module doc to new capabilitiesFlorian Riedl2012-10-026-64/+135