summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'beta'Rainer Gerhards2012-10-119-8/+49
|\
| * 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
* | Merge branch 'beta'Rainer Gerhards2012-10-111-0/+1
|\|
| * add missing prototypeRainer Gerhards2012-10-111-0/+1
| * remove some assert()'s - valgrind does a better job...Rainer Gerhards2012-10-111-4/+0
* | Merge branch 'beta'Rainer Gerhards2012-10-111-0/+5
|\|
| * 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
* | Merge branch 'v6-devel'Rainer Gerhards2012-10-113-7/+5
|\ \
| * | remove some assert()'s - valgrind does a better job...Rainer Gerhards2012-10-111-4/+0
| * | fix small memory leak with string-type templatesRainer Gerhards2012-10-111-0/+1
| * | fix small memory leak when template is specified in omfileRainer Gerhards2012-10-111-0/+1
| * | re-enabled commented-out serialization support in debug handlerRainer Gerhards2012-10-111-3/+3
| * | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-045-29/+2
| |\ \
| * \ \ Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-044-0/+32
| |\ \ \
* | \ \ \ Merge branch 'beta'Rainer Gerhards2012-10-103-5/+24
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | 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
* | | | | preparing for 7.3.0 releasev7.3.0Rainer Gerhards2012-10-083-3/+3
* | | | | fix compile problem with DEBUG instrumentation enabledRainer Gerhards2012-10-081-1/+0
* | | | | Merge branch 'c1-streamzip' into master-streamzipRainer Gerhards2012-10-055-51/+125
|\ \ \ \ \
| * | | | | improved omfile zip writer to increase compressionRainer Gerhards2012-09-146-51/+124
* | | | | | Merge branch 'beta'Rainer Gerhards2012-10-046-28/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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
| | | |_|_|/ | | |/| | |
* | / | | | omlibdbi improvementsRainer Gerhards2012-10-043-44/+161
|/ / / / /
* | | | | 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