summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\|
| * remove unused variables (if SCM_CREDENTIALS is not available)Cristian Ionescu-Idbohrn2012-09-122-1/+9
| * imuxsock: remove incorrect socket option callCristian Ionescu-Idbohrn2012-09-121-4/+0
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-111-3/+1
|\|
| * fix compile problem on FreeBSDBrad Davis2012-09-111-3/+1
* | preparing for 6.4.1 releaseRainer Gerhards2012-09-064-7/+9
* | Fixed TCP CheckConnection handling in omfwd.c.Andre Lorbach2012-08-257-9/+30
* | bugfix: omusrsmsg incorrect return state & config warning handlingRainer Gerhards2012-08-283-2/+26
* | doc: add incompatible patch info to ChangeLogRainer Gerhards2012-08-261-0/+12
* | INCOMPATIBLE: Return {} for missing $!all-jsonMiloslav Trmač2012-08-261-1/+1
* | INCOMPATIBLE: use :, not =, as separator for jsonfMiloslav Trmač2012-08-262-2/+2
* | Remove a no-effect ", NULL";Miloslav Trmač2012-08-261-1/+1
* | Fix printing of some template optionsMiloslav Trmač2012-08-261-1/+4
* | cleanup: remove left-over commented-out codeRainer Gerhards2012-08-251-10/+0
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-08-2521-105/+193
|\|
| * Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stableRainer Gerhards2012-08-253-30/+48
| |\
| | * change template.[ch] to ASL 2.0, removing a GPLv3-only patchRainer Gerhards2012-08-253-30/+48
| * | preparing for 5.10.0 releaseRainer Gerhards2012-08-224-4/+11
| * | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-08-221-2/+6
| |\|
| | * preparing for 5.8.13 releaseRainer Gerhards2012-08-223-3/+3
| | * nit: forward-compatible default ruleset name as used in next versionRainer Gerhards2012-08-221-1/+1
| * | small bugfix: stream timeout API use was incorrectRainer Gerhards2012-08-221-2/+2