summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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
| * 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
| * bugfix: strm class could abort under some circumstancesRainer Gerhards2012-07-241-6/+4
| * bugfix: DA queue could cause abortRainer Gerhards2012-07-242-3/+6
* | changed TRUE/FALSE to RSTRUE/RSFALSERainer Gerhards2012-08-2214-46/+45
* | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-154-13/+10
|\|
| * bugfix: randomized IP option header in omudpspoof caused problemsRainer Gerhards2012-06-152-13/+5
| * adding pkgconfigdir definition to Makefile.am to help build properlyAbby Edwards2012-06-131-0/+2
| * bugfix "$PreserveFQDN on" was not honored in some modulesRainer Gerhards2012-06-122-0/+3
* | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-113-5/+15
|\|
| * bugfix: "last message repeated n times" message was missing hostnameRainer Gerhards2012-06-113-5/+13
* | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-067-34/+62
|\|
| * preparing for 5.8.12v5.8.12Rainer Gerhards2012-06-063-3/+3
| * bugfix: property PROCID was empty instead of proper nilvalue if not presentRainer Gerhards2012-06-062-1/+5
| * bugfix: potential hang due to mutex deadlockRainer Gerhards2012-06-064-33/+18
| * fixing memleak in recent group resolve patchRainer Gerhards2012-06-062-3/+9
| * call getgrnam_r repeatedly to get all group members.Alec Warner2012-06-061-3/+12
| * add small delay (50ms) after sending shutdown messageRainer Gerhards2012-06-042-0/+9
* | doc: mentioning imported bugfix in ChangeLogRainer Gerhards2012-06-011-0/+7
* | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-014-13/+26
|\|
| * some better code to handle queue congestionRainer Gerhards2012-06-011-10/+15
| * bugfix: delayble source could block action queue, ...Rainer Gerhards2012-06-012-1/+8
| * cosmetic: slightly improved debug outputRainer Gerhards2012-05-311-2/+2
* | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-295-3/+27
|\|
| * bugfix: if debug message could end up in log file when forkingTomas Heinrich2012-05-294-3/+13
| * bugfix/omudpspoof: problems, including abort, happend when run on multiple th...Rainer Gerhards2012-05-142-0/+14
* | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-101-0/+9
|\|
| * bugfix: disk queue was not persisted on shutdown, regression of fix toRainer Gerhards2012-05-102-12/+12
* | bugfix: disk queue was not persisted on shutdown, regression of fix toRainer Gerhards2012-05-102-11/+13
* | Merge branch 'v5-beta' of git+ssh://git.adiscon.com/git/rsyslog into v5-betaRainer Gerhards2012-05-103-3/+3
|\ \
| * | preparing for 5.9.7v5.9.7Rainer Gerhards2012-05-103-3/+3
* | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-103-15/+3
|\ \ \ | |/ / |/| / | |/
| * bugfix/tcpflood: sending small test files did not work correctlyRainer Gerhards2012-05-102-2/+5
| * cleanup: removing no longer needed macrosRainer Gerhards2012-05-042-14/+1
* | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-035-9/+110
|\|
| * preparing for 5.8.11 releasev5.8.11Rainer Gerhards2012-05-033-3/+3
| * ommysql: added support for new mysql_library_[init/exit]Rainer Gerhards2012-05-032-1/+27
| * bugfix: ommysql did not properly init/exit the mysql runtime libraryRainer Gerhards2012-05-032-1/+14