summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-192-2/+4
|\
| * doc: added last bugfix to ChangeLogRainer Gerhards2012-04-191-0/+2
| * bugfix: imptcp input name could not be setRainer Gerhards2012-04-191-2/+2
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-184-8/+45
|\|
| * fixed compile bugRainer Gerhards2012-04-181-1/+1
| * bugfix: assigned ruleset was lost when using disk queuesRainer Gerhards2012-04-184-8/+45
* | doc: added new $uptime propertyRainer Gerhards2012-04-131-0/+4
* | Add a system property, PROP_SYS_UPTIME, to place up-time markers into rsyslog...Steven A. Falco2012-04-132-0/+21
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-126-136/+171
|\|
| * imuxsock: do not cache hostnameRainer Gerhards2012-04-122-11/+5
| * Free also LocalDomain in glbl class destructorMarius Tomaschewski2012-04-111-0/+1
| * Allocate LocalDomain as new stringMarius Tomaschewski2012-04-111-0/+3
| * doc: credits update for last bugfixRainer Gerhards2012-04-111-1/+2
| * bugfix: hostname was not requeried on HUPRainer Gerhards2012-04-115-125/+161
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-073-5/+19
|\|
| * preparing for 5.8.10v5.8.10Rainer Gerhards2012-04-073-3/+3
| * bugfix: segfault on startup if $actionqueuefilename was missing for disk queu...Tomas Heinrich2012-04-052-1/+5
| * doc: noted disk queue format change from v4->v5Rainer Gerhards2012-04-051-0/+5
| * bugfix: segfault if disk-queue was started up with old queue fileTomas Heinrich2012-04-052-3/+8
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-03-174-4/+219
|\|
| * bugfix: memory leak in array passing output module modeRainer Gerhards2012-03-172-2/+6
| * preparing for 5.8.9v5.8.9Rainer Gerhards2012-03-153-3/+3
| * added tool to recover disk queue if .qi file is missing (recover_qi.pl)Kaiwang Chen2012-03-153-1/+211
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-03-146-39/+67
|\|
| * changed statsobj interface and added better docRainer Gerhards2012-03-146-39/+67
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-03-124-3/+18
|\|
| * bugfix: stopped DA queue was never processed after a restartRainer Gerhards2012-03-124-2/+15
| * preparing for 5.8.8v5.8.8Rainer Gerhards2012-03-053-3/+3
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-03-022-2/+6
|\|
| * Fix for "/run/systemd/journal/syslog" detectionMarius Tomaschewski2012-03-021-2/+5
| * Install syslog.service Alias for newer systemd versionsMichael Biebl2012-03-021-0/+1
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-03-011-0/+9
|\|
| * Detect if to use /run/systemd/journal/syslog under systemdMarius Tomaschewski2012-03-011-0/+9
* | mentioned imported bugfix in ChangeLogRainer Gerhards2012-03-011-0/+2
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-03-012-2/+4
|\|
| * bugfix: imklog invalidly computed facility and severityRainer Gerhards2012-03-012-2/+4
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-02-031-16/+14
|\|
| * Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-02-031-16/+14
| |\
| | * ommysql: put under ASL 2.0Rainer Gerhards2012-02-031-16/+14
* | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-02-010-0/+0
|\| |
| * | undoing last commit: wrong branchRainer Gerhards2012-01-301-1/+1
| * | indicated special versionRainer Gerhards2012-01-301-1/+1
* | | omgssapi: made recompile againRainer Gerhards2012-02-011-4/+4
* | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-278-48/+69
|\| |
| * | added merged v4 bugfix info to changelogRainer Gerhards2012-01-271-0/+4
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-277-47/+59
| |\|
| | * bugfix: omprog made rsyslog abort on startup if not binary to execute was con...Rainer Gerhards2012-01-273-0/+9
| | * relicense unlimited_select.h under ASL 2.0Rainer Gerhards2012-01-261-15/+14
| | * increased max config file line size to 64kRainer Gerhards2012-01-242-1/+7
| | * licensing changeRainer Gerhards2012-01-212-31/+29