summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* preparing for 6.3.9 (beta) releasev6.3.9Rainer Gerhards2012-05-223-3/+3
* tcpsrv: cleaned up patch, works now with multiple users as wellRainer Gerhards2012-05-181-7/+26
* regression: tcpsrv.c always activated first worker, what lead to hangRainer Gerhards2012-05-161-1/+1
* bugfix: imtcp could cause hang during receptionRainer Gerhards2012-05-162-12/+34
* minor issue: tcpsrv did not decrement wrkr cnt on shutdownRainer Gerhards2012-05-151-1/+3
* Merge branch 'v6-stable'Rainer Gerhards2012-05-102-12/+30
|\
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-05-102-11/+19
| |\
| | * bugfix: disk queue was not persisted on shutdown, regression of fix toRainer Gerhards2012-05-102-12/+12
| * | preparing for 6.2.1v6.2.1Rainer Gerhards2012-05-103-3/+3
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-05-104-16/+7
| |\|
* | | Merge branch 'v5-beta'Rainer Gerhards2012-05-103-15/+6
|\ \ \
| * \ \ 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
| |\| |
| * | | cosmetic: new version in ChangeLogRainer Gerhards2012-04-271-0/+2
| * | | Merge branch 'v5-stable-field-substring' into v5-betaRainer Gerhards2012-04-276-73/+107
| |\ \ \
| | * | | added capability to specify substrings for field extraction modeRainer Gerhards2012-04-275-63/+97
* | | | | cleanup no longer used variableRainer Gerhards2012-05-031-1/+0
* | | | | Merge branch 'v6-stable'Rainer Gerhards2012-05-035-18/+129
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-05-036-19/+120
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | 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
| | * | | bugfix: rsyslog did not terminate when delayable inputs were blockedRainer Gerhards2012-05-032-5/+47
| | * | | bugfix: inside queue.c, some thread cancel states were not correctly reset.Rainer Gerhards2012-05-032-5/+8
| | * | | debug: slightly improved debug info for input module startupRainer Gerhards2012-05-031-0/+1
| | * | | bugfix: active input in "light delay state" could block rsyslog terminationRainer Gerhards2012-04-272-0/+6
| | | |/ | | |/|
| | * | doc: correcting sample section of omudpspoofRainer Gerhards2012-04-201-8/+8
| | * | doc: omudpspoof doc had invalid directivesRainer Gerhards2012-04-201-2/+2
| * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-192-2/+4
| |\| |
* | | | bugfix/omfile: template action parameter was not acceptedRainer Gerhards2012-05-032-1/+4
* | | | better debug instrumentation --> input thread names used for reportingRainer Gerhards2012-05-023-8/+32
* | | | Merge branch 'master-fieldext'Rainer Gerhards2012-04-265-63/+97
|\ \ \ \
| * | | | added capability to specify substrings for field extraction modeRainer Gerhards2012-04-265-63/+97
* | | | | cleanup: removed unused but set parametersRainer Gerhards2012-04-235-10/+4
* | | | | bugfix: omudpspoof did not work correctly if no spoof hostname was configuredRainer Gerhards2012-04-232-1/+3
* | | | | bugfix: number conversion in expression evaluation was not always correctRainer Gerhards2012-04-231-2/+4
|/ / / /
* | | | Merge branch 'v5-beta'Rainer Gerhards2012-04-191-0/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'v5-stable-newstats' into v5-betaRainer Gerhards2012-04-192-2/+6
| |\ \ \
| | * \ \ Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-191-0/+2
| | |\ \ \ | | | | |/ | | | |/|
| | | * | doc: added last bugfix to ChangeLogRainer Gerhards2012-04-191-0/+2
| | | * | bugfix: imptcp input name could not be setRainer Gerhards2012-04-191-2/+2
| | * | | doc: add last bugfix to changelogRainer Gerhards2012-04-192-1/+3
| | * | | bugfix: imptcp input name could not be setRainer Gerhards2012-04-191-2/+2
| * | | | Merge branch 'v5-stable-newstats' into v5-betaRainer Gerhards2012-04-184-5/+45
| |\| | |
| | * | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-180-0/+0
| | |\| |
| | * | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-184-5/+45
| | |\ \ \