summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 releasev6.4.1Rainer 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 releasev5.10.0Rainer Gerhards2012-08-224-4/+11
| * | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-08-221-2/+6
| |\|
| | * preparing for 5.8.13 releasev5.8.13Rainer 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
| * | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-08-226-18/+119
| |\|
| | * bugfix: multiple main queues with same queue file name were not detectedRainer Gerhards2012-08-223-3/+48
| * | changed TRUE/FALSE to RSTRUE/RSFALSERainer Gerhards2012-08-2214-46/+45
| * | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-154-13/+10
| |\ \
| * \ \ Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-113-5/+15
| |\ \ \
* | \ \ \ Merge branch 'beta' into v6-stableRainer Gerhards2012-08-20211-11720/+15449
|\ \ \ \ \
| * | | | | nitfix: status indication (now: stable) was invalid in ChangeLogv6.4.0Rainer Gerhards2012-08-201-1/+1
| * | | | | Merge branch 'v5-stable' into betaRainer Gerhards2012-08-203-3/+61
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | nitfix: remove quirck in new debug message codeRainer Gerhards2012-08-011-4/+2
| | * | | | more elaborate debug logging for object deserializerRainer Gerhards2012-08-011-0/+39
| | * | | | undo last queue patch - caused a regressionRainer Gerhards2012-08-012-5/+1
| | * | | | bugfix: potential abort if output plugin logged message during shutdownRainer Gerhards2012-08-012-7/+28
| | * | | | bugfix: DA queue fixed handling of bad queue files.Andre Lorbach2012-07-312-1/+5
| * | | | | preparing for 6.4.0 releaseRainer Gerhards2012-08-203-3/+6
| * | | | | doc: add last patch to ChangelogRainer Gerhards2012-08-011-0/+3
| * | | | | fix problem with cutting first 16 characters from message with bAnnotate on m...Milan Bartos2012-08-011-1/+5
| * | | | | bugfix: imptcp aborted when $InputPTCPServerBindRuleset was usedRainer Gerhards2012-07-242-1/+2
| * | | | | Merge branch 'v5-stable' into betaRainer Gerhards2012-07-243-9/+10
| |\| | | |
| * | | | | omelasticsearch: regression from "parent" feature could case abortsRainer Gerhards2012-07-111-23/+26
| * | | | | bugfix: imtcp aborted when more than 2 connections were used.Andre Lorbach2012-07-114-3/+6
| * | | | | omelasticsearch: support for parameters parent & dynparent addedRainer Gerhards2012-07-102-20/+98
| * | | | | omelasticsearch: implement retry via request to es server homepageRainer Gerhards2012-07-101-10/+60