summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'beta'Rainer Gerhards2012-10-165-53/+41
|\
| * Merge branch 'v6-stable' into betaRainer Gerhards2012-10-163-38/+17
| |\
| | * cleanup: removed remains of -c option (compatibility mode)Rainer Gerhards2012-10-164-39/+14
| * | doc: mention recent patches in ChangeLogRainer Gerhards2012-10-161-3/+7
| * | systemd: Remove obsolete ExecStartPre commandMichael Biebl2012-10-161-1/+0
| * | systemd: Drop obsolete compatibility flagMichael Biebl2012-10-161-1/+1
| * | prepare for version 7.1.11Rainer Gerhards2012-10-163-4/+8
| * | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-162-9/+11
| |\|
| | * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-162-8/+10
| | |\
| | | * bugfix: imuxsock truncated head of received messageRainer Gerhards2012-10-162-8/+6
| | | * fix problem with cutting first 16 characters from message with bAnnotate on m...Milan Bartos2012-10-101-1/+5
| | * | doc: fix minor small but important typo in ChangeLogRainer Gerhards2012-10-161-1/+1
* | | | doc: update ChangeLog with CEE cookie changeRainer Gerhards2012-10-111-0/+8
* | | | Merge branch 'beta'Rainer Gerhards2012-10-113-3/+26
|\| | |
| * | | 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
* | | | 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 releaseRainer 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 releaseRainer 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 releaseRainer 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
|\ \ \ \ \ \