summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* change action queue default enqueue timeout from 2000ms to 50msRainer Gerhards2012-06-012-1/+10
* Merge branch 'beta'Rainer Gerhards2012-06-014-13/+33
|\
| * Merge branch 'v6-stable' into betaRainer Gerhards2012-06-010-0/+0
| |\
| | * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-06-017-16/+52
| | |\
| * | \ Merge branch 'v5-beta' into betaRainer Gerhards2012-06-014-13/+33
| |\ \ \
| | * | | 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 'beta'Rainer Gerhards2012-05-316-2/+15
|\| | | |
| * | | | Skip tests that require root if euid != 0Miloslav Trmač2012-05-314-0/+12
| * | | | Don't run valgrind tests if imdiag is not enabledMiloslav Trmač2012-05-311-2/+2
| * | | | Add ylwrap to .gitignoreMiloslav Trmač2012-05-311-0/+1
* | | | | imrelp now supports non-cancel thread terminationRainer Gerhards2012-05-314-5/+41
* | | | | improved support for --enable-debuglessRainer Gerhards2012-05-294-17/+16
* | | | | Merge branch 'beta'Rainer Gerhards2012-05-292-0/+3
|\| | | |
| * | | | bugfix: invalid free in imptcp could lead to abort during startupRainer Gerhards2012-05-292-0/+3
* | | | | added --enable-debugless configure option for very high demanding environmentsRainer Gerhards2012-05-2910-48/+71
|/ / / /
* | | | Merge branch 'v5-beta' into betaRainer Gerhards2012-05-295-4/+57
|\| | |
| * | | 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-11/+13
* | | | 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