summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-06-011-0/+11
|\
| * bugfix/omudpspoof: problems, including abort, happend when run on multiple th...Rainer Gerhards2012-05-141-0/+11
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-05-031-1/+19
|\|
| * ommysql: added support for new mysql_library_[init/exit]Rainer Gerhards2012-05-031-1/+11
| * bugfix: ommysql did not properly init/exit the mysql runtime libraryRainer Gerhards2012-05-031-1/+9
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-191-2/+2
|\|
| * bugfix: imptcp input name could not be setRainer Gerhards2012-04-191-2/+2
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-121-10/+4
|\|
| * imuxsock: do not cache hostnameRainer Gerhards2012-04-121-10/+4
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-03-141-1/+4
|\|
| * changed statsobj interface and added better docRainer Gerhards2012-03-141-1/+4
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-03-021-2/+5
|\|
| * Fix for "/run/systemd/journal/syslog" detectionMarius Tomaschewski2012-03-021-2/+5
* | 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
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-03-011-2/+2
|\|
| * bugfix: imklog invalidly computed facility and severityRainer Gerhards2012-03-011-2/+2
* | 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
* | | omgssapi: made recompile againRainer Gerhards2012-02-011-4/+4
* | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-273-31/+35
|\| |
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-273-31/+35
| |\|
| | * bugfix: omprog made rsyslog abort on startup if not binary to execute was con...Rainer Gerhards2012-01-271-0/+6
| | * licensing changeRainer Gerhards2012-01-212-31/+29
* | | undoing v6.1 config scoping interface, part II (now finished)Rainer Gerhards2012-01-1915-65/+65
* | | undoing v6.1 config scoping interface, part IRainer Gerhards2012-01-1813-92/+92
* | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-181-17/+16
|\| |
| * | licensing updateRainer Gerhards2012-01-161-17/+16
* | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-1417-276/+240
|\| |
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-1416-252/+226
| |\|
| | * more files moved to ASL 2.0Rainer Gerhards2012-01-124-66/+58
| | * relicense parts under ASL 2.0Rainer Gerhards2012-01-1112-186/+168
| * | relicense to ASL 2.0Rainer Gerhards2012-01-111-24/+14
* | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-091-2/+5
|\| |
| * | bugfix: imuxsock did truncate part of received message if it did not contain ...Rainer Gerhards2011-12-201-2/+5
* | | Merge branch 'v5-stable' into betaRainer Gerhards2011-12-161-3/+1
|\| |
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-12-161-3/+1
| |\|
| | * bugfix: potential fatal abort in omgssapiTomas Heinrich2011-12-161-3/+1
| | * Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-201-5/+0
| | |\
| | * \ Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-092-3/+13
| | |\ \
* | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-131-2/+2
|\| | | |
| * | | | bugfix: imfile did invalid system call under some circumstancesRainer Gerhards2011-10-071-2/+2
* | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-09-261-5/+10
|\| | | |
| * | | | bugfix: imuxsock did no longer ignore message-provided timestamp,Rainer Gerhards2011-09-071-5/+10
* | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-08-311-0/+1
|\| | | |
| * | | | bugfix: mark message processing did not work correctlyRainer Gerhards2011-08-311-0/+1
* | | | | Merge branch 'v5-stable' into betaAndre Lorbach2011-08-051-1/+1
|\| | | |
| * | | | doc: cleanup of copy-and-paste error in commentRainer Gerhards2011-07-131-1/+1
* | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-07-061-9/+14
|\| | | |