summaryrefslogtreecommitdiffstats
path: root/plugins/imklog
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v6-stable' into betaRainer Gerhards2012-10-172-3/+5
|\
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-172-3/+5
| |\
| | * imklog: use memmove instead of memcpy (solaris)Marius Tomaschewski2012-10-171-1/+1
| | * imklog: use memmove to remove kernel timestampMarius Tomaschewski2012-10-171-1/+1
| | * imklog: skip leading spaces in kernel timestampMarius Tomaschewski2012-10-171-1/+3
| | * Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-071-23/+1
| | |\
| | * \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-121-1/+26
| | |\ \
| | * \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2012-03-012-31/+29
| | |\ \ \
| | * | | | bugfix: imklog invalidly computed facility and severityRainer Gerhards2012-03-011-2/+2
* | | | | | imklog: removal of no longer needed config directivesRainer Gerhards2012-06-292-37/+6
* | | | | | Merge branch 'beta' into master-moduleRainer Gerhards2012-06-291-5/+0
|\| | | | |
| * | | | | imklog: cleanup of no longer used codeRainer Gerhards2012-06-292-32/+0
* | | | | | imklog: support for module() global config parameters addedRainer Gerhards2012-06-292-58/+116
|/ / / / /
* | | | | cleanup: removed unused but set parametersRainer Gerhards2012-04-231-2/+0
* | | | | Merge branch 'v5-stable-newstats'Rainer Gerhards2012-04-071-0/+5
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | unified use of $LocalHostIPIF among all locally-emitting inputsRainer Gerhards2012-03-221-23/+1
| | |_|/ | |/| |
| * | | added capability to use a local interface IP address as fromhost-ip for imklogRainer Gerhards2012-03-101-1/+26
| | |/ | |/|
* | | Merge branch 'v6-stable'Rainer Gerhards2012-03-011-2/+2
|\| |
| * | bugfix: imklog invalidly computed facility and severityRainer Gerhards2012-03-011-2/+2
* | | Merge branch 'v6-stable'Rainer Gerhards2012-01-272-31/+29
|\| |
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-272-31/+29
| |\ \
| | * | licensing changeRainer Gerhards2012-01-212-31/+29
| | * | Merge branch 'v4-stable' into v4-develRainer Gerhards2010-12-161-3/+1
| | |\ \
| | * \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2010-10-191-3/+3
| | |\ \ \
* | | \ \ \ Merge branch 'v5-devel' & fix bug in BSD imklog driverRainer Gerhards2012-01-238-2105/+176
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | imklog: forgot to remove one file; now doneRainer Gerhards2012-01-231-35/+0
| * | | | | refactored imklog linux driver, now combined with BSD driverRainer Gerhards2012-01-237-2063/+170
| * | | | | preparing for 5.9.1 releasev5.9.1Rainer Gerhards2011-06-301-3/+0
* | | | | | Merge branch 'v6-stable-noscoping' into masterRainer Gerhards2012-01-191-9/+9
|\ \ \ \ \ \
| * | | | | | undoing v6.1 config scoping interface, part IRainer Gerhards2012-01-181-9/+9
* | | | | | | somewhat more informative imklog status messages (mostly cosmetic)Rainer Gerhards2011-08-051-2/+4
* | | | | | | milestone: added module config namesRainer Gerhards2011-07-201-0/+1
* | | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-06-275-97/+117
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | added support for obtaining timestamp for kernel message from messageRainer Gerhards2011-06-245-99/+125
* | | | | | | step: imklog (linux) moved to v2 config systemRainer Gerhards2011-05-254-111/+188
* | | | | | | step: imtcp moved to new config interfaceRainer Gerhards2011-05-051-2/+2
* | | | | | | step: put plumbing in place for new input module config systemRainer Gerhards2011-05-031-0/+30
* | | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-04-261-4/+20
|\| | | | | | | |/ / / / / |/| | | | |
| * | | | | experimental: support for systemd-induced second PRI in klogRainer Gerhards2011-03-181-4/+20
| |/ / / /
* | | | | Merge branch 'v5-beta'Rainer Gerhards2011-03-111-0/+1
|\| | | |
| * | | | added work-around for bug in gtls, which causes fd leak when using TLSBojan Smojver2011-02-231-0/+1
* | | | | Merge branch 'v5-devel'Rainer Gerhards2010-12-171-3/+1
|\| | | |
| * | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2010-12-161-3/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | some cleanup based on clang static analyzer resultsRainer Gerhards2010-12-161-3/+1
| | | |/ | | |/|
* | | | Merge branch 'v5-devel'Rainer Gerhards2010-10-221-3/+3
|\| | |
| * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2010-10-191-3/+3
| |\| |
| | * | fixing some compile problems on FreeBSDRainer Gerhards2010-10-191-3/+3
* | | | moving towards scoping inside rsyslog.confRainer Gerhards2010-07-211-9/+9
|/ / /
* | | Merge branch 'v4-devel' into masterRainer Gerhards2010-04-194-53/+23
|\ \ \ | | |/ | |/|
| * | first version of imsolaris created, cleanup for solaris doneRainer Gerhards2010-04-151-4/+0