Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge branch 'v5-devel' into master | Rainer Gerhards | 2012-01-18 | 18 | -160/+590 | |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | ||||||
| * | | | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-01-18 | 1 | -15/+41 | |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | ||||||
| | * | | | | | imptcp: added additional information to stats record | Rainer Gerhards | 2012-01-18 | 1 | -6/+10 | |
| | * | | | | | imptcp: added basic stats counters | Rainer Gerhards | 2012-01-18 | 1 | -10/+32 | |
| | * | | | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-01-16 | 1 | -17/+16 | |
| | |\ \ \ \ \ | ||||||
| * | \ \ \ \ \ | Merge branch 'v5-stable-elasticsearch' into v5-devel-tmp | Rainer Gerhards | 2012-01-17 | 10 | -56/+404 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | elasticsearch: move to asl 2.0 | Rainer Gerhards | 2012-01-17 | 1 | -14/+13 | |
| | * | | | | | | | add elasticsearch output module | Nathan Scott | 2012-01-17 | 5 | -0/+323 | |
| | * | | | | | | | add JSON escaping option | Nathan Scott | 2012-01-17 | 3 | -38/+63 | |
| | | |_|_|_|/ / | | |/| | | | | | ||||||
| * | | | | | | | $IMUXSockRateLimitInterval DEFAULT CHANGED, was 5, now 0 | Rainer Gerhards | 2012-01-16 | 3 | -2/+14 | |
| * | | | | | | | fix error of not define HAVE_SETSID | Peng Haitao | 2012-01-16 | 1 | -0/+7 | |
| * | | | | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-01-16 | 113 | -1708/+1594 | |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||||
| | * | | | | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-01-16 | 2 | -1/+23 | |
| | |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-01-16 | 111 | -1707/+1571 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-01-09 | 2 | -5/+7 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | omfwd refactor: even more simplification (small one ;)) | Rainer Gerhards | 2012-01-14 | 1 | -2/+1 | |
| * | | | | | | | | | | cosmetic: cleanup of ChangeLog | Rainer Gerhards | 2012-01-14 | 1 | -2/+0 | |
| * | | | | | | | | | | omfwd license change to ASL 2.0 | Rainer Gerhards | 2012-01-14 | 1 | -20/+16 | |
| * | | | | | | | | | | omfwd refactor: simplification | Rainer Gerhards | 2012-01-14 | 1 | -9/+6 | |
| * | | | | | | | | | | omfwd refactor: simplifying code | Rainer Gerhards | 2012-01-14 | 1 | -21/+9 | |
| * | | | | | | | | | | Merge branch 'v5-devel' into v5-devel-tmp | Rainer Gerhards | 2012-01-12 | 1 | -4/+0 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | regression fix: imuxsock-received messages were malformed | Rainer Gerhards | 2012-01-12 | 1 | -4/+0 | |
| * | | | | | | | | | | | part of merge, but forgot to add to merge set | Rainer Gerhards | 2012-01-10 | 1 | -0/+3 | |
| * | | | | | | | | | | | Merge branch 'v4-stable-tmp' into v5-devel-tmp | Rainer Gerhards | 2012-01-10 | 4 | -1/+13 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | Merge branch 'tmp' into v4-stable-tmp | Rainer Gerhards | 2012-01-10 | 4 | -1/+16 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | added $SpaceLFOnReceive config directive | Tomas Heinrich | 2012-01-10 | 4 | -1/+16 | |
| | * | | | | | | | | | | | Merge branch 'tmp' into v4-stable-tmp | Rainer Gerhards | 2012-01-10 | 2 | -0/+7 | |
| | |\| | | | | | | | | | | ||||||
| | | * | | | | | | | | | | added canned template for ultra-exact sysklogd file format | Tomas Heinrich | 2012-01-10 | 2 | -0/+7 | |
| * | | | | | | | | | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2012-01-09 | 2 | -5/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge v5-stable-newstats & manual ChangeLog update | Rainer Gerhards | 2012-01-09 | 1 | -0/+1 | |
| * | | | | | | | | | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-01-09 | 1 | -94/+86 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | | push version number | Rainer Gerhards | 2012-01-09 | 1 | -1/+1 | |
| | * | | | | | | | | | | | imudp: added per-listner stats settings & more refactoring | Rainer Gerhards | 2012-01-09 | 1 | -74/+80 | |
| | * | | | | | | | | | | | imudp refactor: field renaming (new names more more sense) | Rainer Gerhards | 2012-01-09 | 1 | -20/+19 | |
| | * | | | | | | | | | | | imudp refactor: regression fix | Rainer Gerhards | 2012-01-09 | 1 | -3/+3 | |
| | * | | | | | | | | | | | imudp refactor: fixed socket leak | Rainer Gerhards | 2012-01-09 | 1 | -9/+5 | |
| | * | | | | | | | | | | | nit fixed (testing aid removed) | Rainer Gerhards | 2012-01-08 | 1 | -2/+1 | |
| | * | | | | | | | | | | | cleanup of imudp to use better lstn data structure (part I) | Rainer Gerhards | 2012-01-08 | 1 | -68/+60 | |
| | * | | | | | | | | | | | prepared milestone (version push) | Rainer Gerhards | 2011-12-21 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Merge branch 'v5-stable' into master | Rainer Gerhards | 2012-01-18 | 100 | -1502/+1418 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | preparing for 5.8.7v5.8.7 | Rainer Gerhards | 2012-01-17 | 3 | -3/+5 | |
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | licensing update | Rainer Gerhards | 2012-01-16 | 1 | -17/+16 | |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-16 | 2 | -1/+23 | |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | / | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | ||||||
| | * | | | | | | | | FQDN hostname for multihomed host was not always set to the correct name | Tomas Heinrich | 2012-01-16 | 2 | -2/+24 | |
| * | | | | | | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-16 | 65 | -1001/+882 | |
| |\| | | | | | | | | ||||||
| | * | | | | | | | | license changes | Rainer Gerhards | 2012-01-16 | 45 | -704/+617 | |
| | * | | | | | | | | runtime license change | Rainer Gerhards | 2012-01-16 | 20 | -297/+265 | |
| * | | | | | | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-14 | 2 | -35/+30 | |
| |\| | | | | | | | | | |_|_|_|_|_|_|/ | |/| | | | | | | | ||||||
| | * | | | | | | | license change | Rainer Gerhards | 2012-01-14 | 2 | -35/+30 | |
| * | | | | | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-14 | 43 | -647/+645 | |
| |\| | | | | | | |