summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Expand)AuthorAgeFilesLines
* 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
* | cosmetic: remove compiler warningsRainer Gerhards2012-01-192-2/+2
* | v6.1/2 scoping support removed from pluginsRainer Gerhards2012-01-1913-38/+26
* | Merge branch 'v6-stable-noscoping' into masterRainer Gerhards2012-01-1926-165/+165
|\ \
| * | 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
| |\ \
| * \ \ Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-1417-276/+240
| |\ \ \
| * \ \ \ Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-091-2/+5
| |\ \ \ \
* | \ \ \ \ Merge branch 'v5-devel' into masterRainer Gerhards2012-01-185-72/+417
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-01-181-15/+41
| |\ \ \ \ \
| | * | | | | imptcp: added additional information to stats recordRainer Gerhards2012-01-181-6/+10
| | * | | | | imptcp: added basic stats countersRainer Gerhards2012-01-181-10/+32
| | * | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-161-17/+16
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| * | | | | | Merge branch 'v5-stable-elasticsearch' into v5-devel-tmpRainer Gerhards2012-01-173-17/+294
| |\ \ \ \ \ \
| | * | | | | | elasticsearch: move to asl 2.0Rainer Gerhards2012-01-171-14/+13
| | * | | | | | add elasticsearch output moduleNathan Scott2012-01-172-0/+279
| | | |/ / / / | | |/| | | |
| * | | | | | $IMUXSockRateLimitInterval DEFAULT CHANGED, was 5, now 0Rainer Gerhards2012-01-161-1/+1
| * | | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-01-1617-276/+240
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-1617-276/+240
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| * | | | | | regression fix: imuxsock-received messages were malformedRainer Gerhards2012-01-121-4/+0
| * | | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-01-091-94/+86
| |\| | | | |
| | * | | | | imudp: added per-listner stats settings & more refactoringRainer Gerhards2012-01-091-74/+80
| | * | | | | imudp refactor: field renaming (new names more more sense)Rainer Gerhards2012-01-091-20/+19
| | * | | | | imudp refactor: regression fixRainer Gerhards2012-01-091-3/+3
| | * | | | | imudp refactor: fixed socket leakRainer Gerhards2012-01-091-9/+5
| | * | | | | nit fixed (testing aid removed)Rainer Gerhards2012-01-081-2/+1
| | * | | | | cleanup of imudp to use better lstn data structure (part I)Rainer Gerhards2012-01-081-68/+60
* | | | | | | Merge branch 'v5-stable' into masterRainer Gerhards2012-01-1818-293/+257
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | licensing updateRainer Gerhards2012-01-161-17/+16
| | |_|/ / / | |/| | | |
| * | | | | 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
| | |_|_|_|/ | |/| | | |
* | | | | | removed imtemplate/omtemplate template modules, as this was waste of timeRainer Gerhards2012-01-094-715/+0
* | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-12-201-9/+9
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-201-9/+9
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2011-12-201-2/+5
| | |\| | |
| | | * | | 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-192-1/+18
|\| | | | |
| * | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-191-0/+17
| |\| | | |
| | * | | | imudp: stats addedRainer Gerhards2011-12-191-0/+17
| * | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-191-3/+1
| |\| | | |
| | * | | | added instrumentationRainer Gerhards2011-12-191-1/+1
| | |/ / /
| * | | | new stats counter "discarded" for queue objectRainer Gerhards2011-12-161-1/+1
* | | | | 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-stable' into v5-develRainer Gerhards2011-10-171-2/+2
| |\ \ \ \