Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v6-stable' | Rainer Gerhards | 2012-01-27 | 3 | -31/+35 |
|\ | |||||
| * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-01-27 | 3 | -31/+35 |
| |\ | |||||
| | * | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-27 | 3 | -31/+35 |
| | |\ | |||||
| | | * | bugfix: omprog made rsyslog abort on startup if not binary to execute was con... | Rainer Gerhards | 2012-01-27 | 1 | -0/+6 |
| | | * | licensing change | Rainer Gerhards | 2012-01-21 | 2 | -31/+29 |
* | | | | omprog: added support for v6 config system | Rainer Gerhards | 2012-01-27 | 1 | -0/+67 |
* | | | | cleanup: remove omdbalerting | Rainer Gerhards | 2012-01-27 | 2 | -154/+0 |
* | | | | Merge branch 'v5-devel' & fix bug in BSD imklog driver | Rainer Gerhards | 2012-01-23 | 8 | -2105/+176 |
|\ \ \ \ | |||||
| * | | | | imklog: forgot to remove one file; now done | Rainer Gerhards | 2012-01-23 | 1 | -35/+0 |
| * | | | | refactored imklog linux driver, now combined with BSD driver | Rainer Gerhards | 2012-01-23 | 7 | -2063/+170 |
* | | | | | cosmetic: remove compiler warnings | Rainer Gerhards | 2012-01-19 | 2 | -2/+2 |
* | | | | | v6.1/2 scoping support removed from plugins | Rainer Gerhards | 2012-01-19 | 13 | -38/+26 |
* | | | | | Merge branch 'v6-stable-noscoping' into master | Rainer Gerhards | 2012-01-19 | 26 | -165/+165 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | undoing v6.1 config scoping interface, part II (now finished) | Rainer Gerhards | 2012-01-19 | 15 | -65/+65 |
| * | | | | undoing v6.1 config scoping interface, part I | Rainer Gerhards | 2012-01-18 | 13 | -92/+92 |
| * | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-01-18 | 1 | -17/+16 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-01-14 | 17 | -276/+240 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-01-09 | 1 | -2/+5 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge branch 'v5-devel' into master | Rainer Gerhards | 2012-01-18 | 5 | -72/+417 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | 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 | 3 | -17/+294 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | elasticsearch: move to asl 2.0 | Rainer Gerhards | 2012-01-17 | 1 | -14/+13 |
| | * | | | | | | | add elasticsearch output module | Nathan Scott | 2012-01-17 | 2 | -0/+279 |
| | | |/ / / / / | | |/| | | | | | |||||
| * | | | | | | | $IMUXSockRateLimitInterval DEFAULT CHANGED, was 5, now 0 | Rainer Gerhards | 2012-01-16 | 1 | -1/+1 |
| * | | | | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-01-16 | 17 | -276/+240 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-01-16 | 17 | -276/+240 |
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | |||||
| * | | | | | | | regression fix: imuxsock-received messages were malformed | Rainer Gerhards | 2012-01-12 | 1 | -4/+0 |
| * | | | | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-01-09 | 1 | -94/+86 |
| |\| | | | | | | |||||
| | * | | | | | | 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 |
* | | | | | | | | Merge branch 'v5-stable' into master | Rainer Gerhards | 2012-01-18 | 18 | -293/+257 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | licensing update | Rainer Gerhards | 2012-01-16 | 1 | -17/+16 |
| | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-14 | 16 | -252/+226 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | more files moved to ASL 2.0 | Rainer Gerhards | 2012-01-12 | 4 | -66/+58 |
| | * | | | | | relicense parts under ASL 2.0 | Rainer Gerhards | 2012-01-11 | 12 | -186/+168 |
| * | | | | | | relicense to ASL 2.0 | Rainer Gerhards | 2012-01-11 | 1 | -24/+14 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | removed imtemplate/omtemplate template modules, as this was waste of time | Rainer Gerhards | 2012-01-09 | 4 | -715/+0 |
* | | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-12-20 | 1 | -9/+9 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2011-12-20 | 1 | -9/+9 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2011-12-20 | 1 | -2/+5 |
| | |\| | | | |||||
| | | * | | | bugfix: imuxsock did truncate part of received message if it did not contain ... | Rainer Gerhards | 2011-12-20 | 1 | -2/+5 |
* | | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-12-19 | 2 | -1/+18 |
|\| | | | | | |||||
| * | | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2011-12-19 | 1 | -0/+17 |
| |\| | | | |