summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-192-4/+4
|\
| * fix epoll-enabled code to use correct data member for pointersRainer Gerhards2012-10-192-4/+4
* | bugfix: imuxsock did not properly honor $LocalHostIPIFRainer Gerhards2012-10-192-5/+1
* | doc: reflect recent (v5-imported) fix in ChangeLogRainer Gerhards2012-10-171-1/+1
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-173-5/+7
|\|
| * preparing for 5.10.1Rainer Gerhards2012-10-173-4/+4
| * imklog: use memmove instead of memcpy (solaris)Marius Tomaschewski2012-10-171-1/+1
| * imklog: use memmove to remove kernel timestampMarius Tomaschewski2012-10-171-1/+1
| * imklog: skip leading spaces in kernel timestampMarius Tomaschewski2012-10-171-1/+3
* | cleanup: removed remains of -c option (compatibility mode)Rainer Gerhards2012-10-164-39/+14
* | 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
* | change lumberjack cookie to "@cee" from "@cee "Rainer Gerhards2012-10-112-1/+7
* | 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-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
* | 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
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-262-0/+9
|\|
| * enable DNS resolution in imrelpApollon Oikonomopoulos2012-09-262-0/+9
* | Remove no longer needed functionRainer Gerhards2012-09-231-5/+0
* | Implemented different grammar for pri filtersRainer Gerhards2012-09-211-1/+1
* | bugfix: some valid legacy PRI filters were flagged as errornousRainer Gerhards2012-09-212-1/+5
* | SimplifyRainer Gerhards2012-09-201-4/+1
* | Added missing iRet handler code into CheckConnection() in netstrm.cAndre Lorbach2012-09-201-1/+4
* | doc: add last bugfix to ChangeLogRainer Gerhards2012-09-201-0/+5
* | Fix missing Sysklogd templateMilan Bartos2012-09-201-0/+3
* | preparing for 6.4.2 releaseRainer Gerhards2012-09-204-3/+3
* | testbench: do not run tests requiring root privs if non-rootRainer Gerhards2012-09-202-0/+8
* | bugfix: config validation run did not always return correct return stateRainer Gerhards2012-09-202-0/+2
* | bugfix: potential abort, if action queue could not be properly startedRainer Gerhards2012-09-193-2/+19
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-141-1/+1
|\|
| * Debug logging slightly improvedRainer Gerhards2012-09-141-1/+1
* | Fix length calculation for script string constantsRainer Gerhards2012-09-141-2/+2
* | Fix new testbench testRainer Gerhards2012-09-141-1/+1
* | Add test for script-based contains filter to testbenchRainer Gerhards2012-09-143-0/+20
* | Fixing string unescaping (new code from this morning's commit)Rainer Gerhards2012-09-131-1/+1
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-132-78/+87
|\|
| * bugfix: invalid property name in property-filter could cause abortRainer Gerhards2012-09-132-56/+67
* | bugfix: missing support for escape sequences in RainerScriptRainer Gerhards2012-09-135-2/+162
* | nit: correct messed-up ChangeLogRainer Gerhards2012-09-121-3/+5
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-122-5/+11
|\|