summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v5-devel' & fix bug in BSD imklog driverRainer Gerhards2012-01-2310-2105/+185
|\
| * imklog: forgot to remove one file; now doneRainer Gerhards2012-01-231-35/+0
| * refactored imklog linux driver, now combined with BSD driverRainer Gerhards2012-01-239-2063/+176
* | cosmetic: remove compiler warningsRainer Gerhards2012-01-194-5/+4
* | refactor: removing dead apc codeRainer Gerhards2012-01-196-466/+0
* | refactor: remove very old sync.[ch] system for "abstracting" mutex accessRainer Gerhards2012-01-196-114/+8
* | omshell: light cleanupRainer Gerhards2012-01-191-11/+7
* | cleanup: different text escape types made more portableRainer Gerhards2012-01-192-15/+5
* | refactor: removing v6.1 scoping codeRainer Gerhards2012-01-192-140/+12
* | v6.1/2 scoping support removed from pluginsRainer Gerhards2012-01-1920-97/+39
* | Merge branch 'v6-stable'Rainer Gerhards2012-01-194-16/+4
|\ \
| * | removing the newScope/resumeScope macro interfacesRainer Gerhards2012-01-194-16/+4
* | | Merge branch 'v6-stable-noscoping' into masterRainer Gerhards2012-01-1938-308/+308
|\| |
| * | 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-1825-235/+235
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-1870-1055/+954
| |\ \
| * \ \ Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-1444-671/+659
| |\ \ \
* | \ \ \ Merge branch 'v5-devel' into masterRainer Gerhards2012-01-1818-160/+590
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | 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-1710-56/+404
| |\ \ \ \ \ \
| | * | | | | | elasticsearch: move to asl 2.0Rainer Gerhards2012-01-171-14/+13
| | * | | | | | add elasticsearch output moduleNathan Scott2012-01-175-0/+323
| | * | | | | | add JSON escaping optionNathan Scott2012-01-173-38/+63
| | | |_|_|_|/ | | |/| | | |
| * | | | | | $IMUXSockRateLimitInterval DEFAULT CHANGED, was 5, now 0Rainer Gerhards2012-01-163-2/+14
| * | | | | | fix error of not define HAVE_SETSIDPeng Haitao2012-01-161-0/+7
| * | | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-01-16113-1708/+1594
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-162-1/+23
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-16111-1707/+1571
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-092-5/+7
| | |\ \ \ \ \ \ \
| * | | | | | | | | omfwd refactor: even more simplification (small one ;))Rainer Gerhards2012-01-141-2/+1
| * | | | | | | | | cosmetic: cleanup of ChangeLogRainer Gerhards2012-01-141-2/+0
| * | | | | | | | | omfwd license change to ASL 2.0Rainer Gerhards2012-01-141-20/+16
| * | | | | | | | | omfwd refactor: simplificationRainer Gerhards2012-01-141-9/+6
| * | | | | | | | | omfwd refactor: simplifying codeRainer Gerhards2012-01-141-21/+9
| * | | | | | | | | Merge branch 'v5-devel' into v5-devel-tmpRainer Gerhards2012-01-121-4/+0
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | regression fix: imuxsock-received messages were malformedRainer Gerhards2012-01-121-4/+0
| * | | | | | | | | | part of merge, but forgot to add to merge setRainer Gerhards2012-01-101-0/+3
| * | | | | | | | | | Merge branch 'v4-stable-tmp' into v5-devel-tmpRainer Gerhards2012-01-104-1/+13
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Merge branch 'tmp' into v4-stable-tmpRainer Gerhards2012-01-104-1/+16
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | added $SpaceLFOnReceive config directiveTomas Heinrich2012-01-104-1/+16
| | * | | | | | | | | | Merge branch 'tmp' into v4-stable-tmpRainer Gerhards2012-01-102-0/+7
| | |\| | | | | | | | |
| | | * | | | | | | | | added canned template for ultra-exact sysklogd file formatTomas Heinrich2012-01-102-0/+7
| * | | | | | | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2012-01-092-5/+7
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge v5-stable-newstats & manual ChangeLog updateRainer Gerhards2012-01-091-0/+1
| * | | | | | | | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-01-091-94/+86
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | push version numberRainer Gerhards2012-01-091-1/+1
| | * | | | | | | | | | imudp: added per-listner stats settings & more refactoringRainer Gerhards2012-01-091-74/+80
generated by cgit (git 2.34.1) at 2024-04-27 23:47:29 +0000