summaryrefslogtreecommitdiffstats
path: root/plugins/imuxsock
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v5-beta'Rainer Gerhards2012-04-121-6/+5
|\
| * Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-121-8/+7
| |\
| | * Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-121-8/+7
| | |\
| | | * imuxsock: do not cache hostnameRainer Gerhards2012-04-121-10/+4
| * | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-071-26/+1
| |\| |
| * | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-141-0/+3
| |\ \ \
| * \ \ \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-121-5/+30
| |\ \ \ \
| * \ \ \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2012-03-021-2/+5
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2012-03-011-0/+9
| |\ \ \ \ \ \
* | | | | | | | imuxsock: fixed regression from last mergeRainer Gerhards2012-04-111-0/+7
* | | | | | | | Merge branch 'v5-stable-newstats'Rainer Gerhards2012-04-071-4/+2
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | unified use of $LocalHostIPIF among all locally-emitting inputsRainer Gerhards2012-03-221-26/+1
| | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-03-141-0/+3
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | / | | | |_|_|/ | | |/| | |
| * | | | | imuxsock did ignore configured IP if - always used eth0 if one was set ;)Rainer Gerhards2012-03-101-1/+1
| * | | | | added capability to use a local interface IP address as fromhost-ip for imuxsockRainer Gerhards2012-03-061-5/+30
| | |_|_|/ | |/| | |
* | | | | Merge branch 'v6-stable'Rainer Gerhards2012-03-171-0/+3
|\ \ \ \ \
| * \ \ \ \ 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 'v6-stable'Rainer Gerhards2012-03-021-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
| | | |/ | | |/|
* | | | screwed up during merge - solving that mess ;)Rainer Gerhards2012-03-011-65/+6
* | | | Merge branch 'v6-stable'Rainer Gerhards2012-03-011-0/+68
|\| | |
| * | | 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 'v6-stable-noscoping' into masterRainer Gerhards2012-01-191-22/+22
|\| | |
| * | | undoing v6.1 config scoping interface, part IRainer Gerhards2012-01-181-18/+18
| * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-091-2/+5
| |\| |
| * | | Merge branch 'v5-stable' into betaRainer Gerhards2011-09-261-5/+10
| |\ \ \
| * \ \ \ Merge branch 'v5-stable' into betaRainer Gerhards2011-05-091-2/+7
| |\ \ \ \
* | \ \ \ \ Merge branch 'v5-devel' into masterRainer Gerhards2012-01-181-5/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | $IMUXSockRateLimitInterval DEFAULT CHANGED, was 5, now 0Rainer Gerhards2012-01-161-1/+1
| * | | | | regression fix: imuxsock-received messages were malformedRainer Gerhards2012-01-121-4/+0
* | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-12-201-9/+9
|\| | | | |
| * | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-201-9/+9
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | bugfix: imuxsock did truncate part of received message if it did not contain ...Rainer Gerhards2011-12-201-2/+5
| | | |_|/ | | |/| |
* | | | | Merge branch 'v5-devel'Rainer Gerhards2011-12-161-5/+161
|\| | | |
| * | | | imuxsock: added capability to "annotate" messages with "trusted information",Rainer Gerhards2011-11-291-6/+157
* | | | | Merge branch 'v5-devel'Rainer Gerhards2011-09-261-4/+9
|\| | | |
| * | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-09-071-4/+9
| |\| | |
| | * | | bugfix: imuxsock did no longer ignore message-provided timestamp,Rainer Gerhards2011-09-071-5/+10
| | | |/ | | |/|
* | | | milestone: added module config namesRainer Gerhards2011-07-201-0/+1
* | | | Merge branch 'v5-devel'Rainer Gerhards2011-06-271-15/+70
|\| | |
| * | | added support for obtaining timestamp from system for imuxsockRainer Gerhards2011-06-201-11/+63
| |/ /
* | | step: imuxsock changed to new config systemRainer Gerhards2011-05-121-143/+249
* | | 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-stable'Rainer Gerhards2011-04-271-2/+7
|\| | | |/ |/|
| * bugfix: rate-limiting inside imuxsock did not work 100% correctRainer Gerhards2011-04-271-2/+7
* | Merge branch 'v5-beta'Rainer Gerhards2011-03-111-0/+1
|\|
generated by cgit (git 2.34.1) at 2024-11-16 06:18:29 +0000