summaryrefslogtreecommitdiffstats
path: root/ChangeLog
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslogRainer Gerhards2012-08-021-0/+3
|\
| * Merge branch 'beta'Rainer Gerhards2012-08-011-0/+3
| |\
| | * doc: add last patch to ChangelogRainer Gerhards2012-08-011-0/+3
* | | doc: added last patch to ChangeLogRainer Gerhards2012-07-311-0/+2
|/ /
* | Merge branch 'beta'Rainer Gerhards2012-07-241-3/+8
|\|
| * bugfix: imptcp aborted when $InputPTCPServerBindRuleset was usedRainer Gerhards2012-07-241-0/+1
| * Merge branch 'v5-stable' into betaRainer Gerhards2012-07-241-0/+1
| |\
| * | bugfix: imtcp aborted when more than 2 connections were used.Andre Lorbach2012-07-111-0/+3
| * | omelasticsearch: support for parameters parent & dynparent addedRainer Gerhards2012-07-101-0/+3
| * | preparing for 6.3.12v6.3.12Rainer Gerhards2012-07-021-3/+1
* | | Merge branch 'v5-stable'Rainer Gerhards2012-07-241-0/+1
|\ \ \ | | |/ | |/|
| * | bugfix: DA queue could cause abortRainer Gerhards2012-07-241-0/+1
* | | bugfix: omhdfs did no longer compileRainer Gerhards2012-07-111-0/+1
* | | Merge branch 'beta'Rainer Gerhards2012-06-291-0/+7
|\ \ \ | | |/ | |/|
| * | cosmetic: added info about omelasticsearch to ChangeLogRainer Gerhards2012-06-291-0/+7
* | | Merge branch 'beta' into master-moduleRainer Gerhards2012-06-291-1/+5
|\| |
| * | bugfix: $ActionName was not properly honoredRainer Gerhards2012-06-271-0/+4
| * | preparing for 6.3.11v6.3.11Rainer Gerhards2012-06-181-1/+1
* | | implemented freeCnf() module interface & fixed some mem leaksRainer Gerhards2012-06-251-0/+6
* | | Merge branch 'beta'Rainer Gerhards2012-06-151-0/+5
|\| |
| * | Merge branch 'v6-stable' into betaRainer Gerhards2012-06-151-0/+5
| |\ \
| | * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-06-151-0/+5
| | |\|
| | | * bugfix: randomized IP option header in omudpspoof caused problemsRainer Gerhards2012-06-151-0/+3
| | | * bugfix "$PreserveFQDN on" was not honored in some modulesRainer Gerhards2012-06-121-0/+2
* | | | Merge branch 'beta'Rainer Gerhards2012-06-141-1/+3
|\| | |
| * | | Merge branch 'v6-stable' into betaRainer Gerhards2012-06-141-1/+3
| |\| |
| | * | preparing for 6.2.2 releasev6.2.2Rainer Gerhards2012-06-131-1/+3
* | | | cosmetic: merge remains in ChangeLog cleared upRainer Gerhards2012-06-121-3/+0
* | | | Merge branch 'v5-beta'Rainer Gerhards2012-06-111-0/+5
|\ \ \ \
| * \ \ \ Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-111-0/+6
| |\ \ \ \ | | | |_|/ | | |/| |
* | | | | Merge branch 'beta'Rainer Gerhards2012-06-111-0/+25
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-06-111-0/+25
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-06-111-0/+6
| | |\ \ \ | | | | |/ | | | |/|
| | | * | bugfix: "last message repeated n times" message was missing hostnameRainer Gerhards2012-06-111-0/+4
| | * | | bugfix: did not compile under solaris due to $uptime property codeRainer Gerhards2012-06-081-0/+2
| | * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-06-061-1/+31
| | |\| |
* | | | | Merge branch 'beta'Rainer Gerhards2012-06-111-0/+8
|\| | | |
| * | | | bugfix: expression-based filters with AND/OR could segfaultRainer Gerhards2012-06-111-0/+8
* | | | | Merge branch 'beta'Rainer Gerhards2012-06-061-1/+31
|\| | | |
| * | | | Merge branch 'v5-beta' into betaRainer Gerhards2012-06-061-1/+31
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-061-1/+31
| | |\ \ \ | | | | |/ | | | |/|
| | | * | preparing for 5.8.12v5.8.12Rainer Gerhards2012-06-061-1/+1
| | | * | bugfix: property PROCID was empty instead of proper nilvalue if not presentRainer Gerhards2012-06-061-0/+4
| | | * | bugfix: potential hang due to mutex deadlockRainer Gerhards2012-06-061-4/+8
| | | * | fixing memleak in recent group resolve patchRainer Gerhards2012-06-061-0/+3
| | | * | add small delay (50ms) after sending shutdown messageRainer Gerhards2012-06-041-0/+4
* | | | | cosmetic: updated ChangeLog to mention new 0mq pluginsRainer Gerhards2012-06-041-0/+2
* | | | | Merge branch 'beta'Rainer Gerhards2012-06-041-1/+16
|\| | | |
| * | | | bugfix: made rsyslog compile when libestr ist not installed in /usrv6.3.10Rainer Gerhards2012-06-041-0/+2
| * | | | preparing for 6.3.10Rainer Gerhards2012-06-041-1/+11