summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | 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
| | * | | | | | | | | | | 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
| | * | | | | | | | | | | prepared milestone (version push)Rainer Gerhards2011-12-211-1/+1
* | | | | | | | | | | | | Merge branch 'v5-stable' into masterRainer Gerhards2012-01-18100-1502/+1418
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | preparing for 5.8.7v5.8.7Rainer Gerhards2012-01-173-3/+5
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| * | | | | | | | | | | licensing updateRainer Gerhards2012-01-161-17/+16
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-162-1/+23
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | / | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | FQDN hostname for multihomed host was not always set to the correct nameTomas Heinrich2012-01-162-2/+24
| * | | | | | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-1665-1001/+882
| |\| | | | | | | |
| | * | | | | | | | license changesRainer Gerhards2012-01-1645-704/+617
| | * | | | | | | | runtime license changeRainer Gerhards2012-01-1620-297/+265
| * | | | | | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-142-35/+30
| |\| | | | | | | | | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | license changeRainer Gerhards2012-01-142-35/+30
| * | | | | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-1443-647/+645
| |\| | | | | | |