summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslogAndre Lorbach2012-06-280-0/+0
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'beta'Charlie Root2012-06-281-1/+1
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
* | | | | | | | | | Merge branch 'beta'Andre Lorbach2012-06-281-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / /
| * | | | | | | | Merge branch 'v6-stable' into betaCharlie Root2012-06-281-1/+1
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | / / / / / | | | |/ / / / / | | |/| | | | |
| | * | | | | | Added dragonfly to configure.acBartosz Kuzma2012-06-271-1/+1
* | | | | | | | Merge branch 'beta'Rainer Gerhards2012-06-275-37/+8
|\| | | | | | | | |_|/ / / / / |/| | | | | |
| * | | | | | cleanup: remove config scoping system left-overRainer Gerhards2012-06-272-30/+0
| * | | | | | improve invalid config command error messageRainer Gerhards2012-06-271-1/+2
| * | | | | | bugfix: $ActionName was not properly honoredRainer Gerhards2012-06-272-4/+4
| * | | | | | preparing for 6.3.11v6.3.11Rainer Gerhards2012-06-183-3/+3
* | | | | | | Merge branch 'beta'Rainer Gerhards2012-06-152-12/+7
|\| | | | | |
| * | | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-06-152-12/+7
| |\| | | | |
| | * | | | | Merge branch 'v5-stable' into v6-stableRainer 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
* | | | | | | bugfix: small static memory leak in expression based filtersRainer Gerhards2012-06-141-0/+1
* | | | | | | Merge branch 'beta'Rainer Gerhards2012-06-141-1/+2
|\| | | | | |
| * | | | | | bugfix: small memory leak in imptcp (static after config read)Rainer Gerhards2012-06-141-1/+2
* | | | | | | Merge branch 'beta'Rainer Gerhards2012-06-1414-1/+1554
|\| | | | | |
| * | | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-06-1413-1/+1552
| |\| | | | |
| | * | | | | preparing for 6.2.2 releasev6.2.2Rainer Gerhards2012-06-133-3/+5
| | * | | | | added rpm spec files for rhel / centosAbby Edwards2012-06-1312-0/+1549
| * | | | | | adding pkgconfigdir definition to Makefile.am to help build properlyAbby Edwards2012-06-131-0/+2
* | | | | | | bump default omfile iobuffer size to 4kRainer Gerhards2012-06-141-1/+1
* | | | | | | fixing memory leaks in expression-based filtersRainer Gerhards2012-06-143-0/+77
* | | | | | | re_match() function now also executesRainer Gerhards2012-06-131-4/+16
* | | | | | | milestone: regex is compiled from script based filterRainer Gerhards2012-06-124-3/+63
* | | | | | | cosmetic: merge remains in ChangeLog cleared upRainer Gerhards2012-06-121-3/+0
* | | | | | | 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