summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master-regexp'Rainer Gerhards2012-06-122-2/+18
|\
| * first experiments with regexp'es in RainerScriptRainer Gerhards2012-05-292-2/+18
* | Merge branch 'v5-beta'Rainer Gerhards2012-06-111-0/+5
|\ \
| * \ Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-113-5/+15
| |\ \
* | \ \ Merge branch 'beta'Rainer Gerhards2012-06-112-4/+38
|\ \ \ \
| * \ \ \ Merge branch 'v6-stable' into betaRainer Gerhards2012-06-112-4/+38
| |\ \ \ \
| | * \ \ \ Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-06-113-5/+15
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | bugfix: "last message repeated n times" message was missing hostnameRainer Gerhards2012-06-113-5/+13
| | * | | | bugfix: did not compile under solaris due to $uptime property codeRainer Gerhards2012-06-082-0/+7
| | * | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-06-067-34/+62
| | |\| | |
* | | | | | Merge branch 'beta'Rainer Gerhards2012-06-112-2/+12
|\| | | | |
| * | | | | bugfix: expression-based filters with AND/OR could segfaultRainer Gerhards2012-06-112-2/+12
* | | | | | Merge branch 'beta'Rainer Gerhards2012-06-0610-53/+68
|\| | | | |
| * | | | | Merge branch 'v5-beta' into betaRainer Gerhards2012-06-067-34/+62
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | 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
| * | | | | Remove obsolete ommongodb build instructionsMiloslav Trmač2012-06-051-15/+0
| * | | | | regression fix: last memleak bugfix caused abort in some situationsRainer Gerhards2012-06-051-1/+3
| * | | | | restructured cfsysline handling a bitRainer Gerhards2012-06-051-3/+2
| * | | | | fixing small memleak during config read phaseRainer Gerhards2012-06-051-0/+1
* | | | | | cosmetic: updated ChangeLog to mention new 0mq pluginsRainer Gerhards2012-06-041-0/+2
* | | | | | Merge branch 'beta'Rainer Gerhards2012-06-044-16/+35
|\| | | | |
| * | | | | bugfix: made rsyslog compile when libestr ist not installed in /usrv6.3.10Rainer Gerhards2012-06-042-2/+8
| * | | | | cosmetic: removed autoconf warning messagesRainer Gerhards2012-06-041-4/+4
| * | | | | preparing for 6.3.10Rainer Gerhards2012-06-043-3/+13
| * | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-06-042-7/+10
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | bugfix: --enable-smcustbindcdr configure directive did not workUltrabug2012-06-042-7/+10
* | | | | | Merge branch 'master-zmq'Rainer Gerhards2012-06-0111-5/+1251
|\ \ \ \ \ \
| * | | | | | Minor updatesDavid Kelly2012-06-014-75/+128
| * | | | | | added new-style zeromq plugins, based on czmq api and rsyslog v6 confDavid Kelly2012-05-299-5/+1198
* | | | | | | 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
| |_|_|_|/ / |/| | | | |