summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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
| | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-03-174-4/+219
|\| | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * 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
|\| | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * bugfix: stopped DA queue was never processed after a restartRainer Gerhards2012-03-124-2/+15
| | | | | | | | ...due to a regression from statistics module.
| * 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
| | | | | | | | | | Changed to check "/run/systemd/journal" directory and not the socket, as the socket may not exists [e.g. is not activated].
| * Install syslog.service Alias for newer systemd versionsMichael Biebl2012-03-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From the syslog.socket unit file of newer systemd versions: The default syslog implementation should make syslog.service a symlink to itself, so that this socket activates the right actual syslog service. Examples: /etc/systemd/system/syslog.service -> /lib/systemd/system/rsyslog.service /etc/systemd/system/syslog.service -> /lib/systemd/system/syslog-ng.service Best way to achieve that is by adding this to your unit file (i.e. to rsyslog.service or syslog-ng.service): [Install] Alias=syslog.service http://cgit.freedesktop.org/systemd/systemd/tree/units/syslog.socket#n26
* | 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
| | | | | | | | | | | | | | Detect if we have to use the new /run/systemd/journal/syslog socket instead of the /dev/log under newer systemd versions. Signed-off-by: Marius Tomaschewski <mt@suse.com>
* | 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
| | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=313
* | 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
| | | | | | | | | | | | after getting OK via email from contributor Ariel P. (2012-02-02 22:06 CET)
* | | 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
| | | | | | | | | | | | | | | | | | but this version seems to have a problem, a fix as part of a rewrite is underway. Just wanted to keep things in the same state as before the interface change.
* | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-278-48/+69
|\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/omprog/omprog.c runtime/rsyslog.h
| * | 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 ↵Rainer Gerhards2012-01-273-0/+9
| | | | | | | | | | | | configured
| | * relicense unlimited_select.h under ASL 2.0Rainer Gerhards2012-01-261-15/+14
| | | | | | | | | | | | | | | after receiving permission from Red Hat legal (given in email from Tomas Heinrich)
| | * increased max config file line size to 64kRainer Gerhards2012-01-242-1/+7
| | | | | | | | | | | | | | | We now also emit an error message if even 64k is not enough (not doing so previously may rightfully be considered as a bug)
| | * licensing changeRainer Gerhards2012-01-212-31/+29
| | |
| * | mentioning license change in ChangeLogRainer Gerhards2012-01-211-0/+1
| | |
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-212-0/+3
| |\|
| | * license docs were not properly redistributedRainer Gerhards2012-01-212-0/+3
| | | | | | | | | | | | thanks to Tomas Heinrich for alerting me.
* | | mentioning license change in ChangeLogRainer Gerhards2012-01-211-0/+1
| | |
* | | removing the newScope/resumeScope macro interfacesRainer Gerhards2012-01-194-16/+4
| | | | | | | | | | | | to make using pre-v6-plugins even easier
* | | undoing v6.1 config scoping interface, part II (now finished)Rainer Gerhards2012-01-1915-65/+65
| | | | | | | | | | | | | | | | | | This concludes the removal of the new scoping interface, at least as far as pre v6-plugins are affected. Full code cleanup will happen in the v6.3 branch.
* | | undoing v6.1 config scoping interface, part IRainer Gerhards2012-01-1825-235/+235
| | | | | | | | | | | | The most common files are now changed, more needs to be done.
* | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-1870-1055/+954
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imptcp/imptcp.c
| * | preparing for 5.8.7v5.8.7Rainer Gerhards2012-01-173-3/+5
| | |
| * | licensing updateRainer Gerhards2012-01-161-17/+16
| | |
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-162-1/+23
| |\| | | | | | | | | | | | | Conflicts: tools/syslogd.c
| | * FQDN hostname for multihomed host was not always set to the correct nameTomas Heinrich2012-01-162-2/+24
| | | | | | | | | | | | | | | | | | ..if multiple aliases existed. Thanks to Tomas Heinreich for the patch. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-1665-1001/+882
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/debug.h runtime/obj.c runtime/parser.h runtime/wti.h
| | * license changesRainer Gerhards2012-01-1645-704/+617
| | |
| | * runtime license changeRainer Gerhards2012-01-1620-297/+265
| | |
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-142-35/+30
| |\|
| | * license changeRainer Gerhards2012-01-142-35/+30
| | | | | | | | | | | | after careful consideration of affected code