Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v5-stable-newstats' | Rainer Gerhards | 2012-04-07 | 1 | -8/+2 |
|\ | |||||
| * | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-07 | 2 | -1/+209 |
| |\ | |||||
| * | | milestone: added capability to use a local interface IP address as fromhost-ip | Rainer Gerhards | 2012-03-21 | 1 | -9/+2 |
| * | | added capability to use a local interface IP address as fromhost-ip for imuxsock | Rainer Gerhards | 2012-03-06 | 1 | -0/+1 |
| * | | queue: lightdelay config: keep default of 70% until mark is explicitely set | Rainer Gerhards | 2012-02-22 | 1 | -3/+5 |
| * | | added configuration directives to customize queue light delay marks | Rainer Gerhards | 2012-02-21 | 1 | -2/+6 |
* | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-03-17 | 2 | -1/+209 |
|\ \ \ | |||||
| * \ \ | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-03-17 | 2 | -1/+209 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | added tool to recover disk queue if .qi file is missing (recover_qi.pl) | Kaiwang Chen | 2012-03-15 | 2 | -1/+209 |
| | |/ | |||||
* | | | ompipe: cosmetic, rename var | Rainer Gerhards | 2012-01-27 | 1 | -12/+12 |
* | | | ompipe: support for v6 config system added | Rainer Gerhards | 2012-01-27 | 2 | -9/+63 |
* | | | cosmetic: remove compiler warnings | Rainer Gerhards | 2012-01-19 | 2 | -3/+2 |
* | | | refactor: remove very old sync.[ch] system for "abstracting" mutex access | Rainer Gerhards | 2012-01-19 | 1 | -2/+2 |
* | | | omshell: light cleanup | Rainer Gerhards | 2012-01-19 | 1 | -11/+7 |
* | | | v6.1/2 scoping support removed from plugins | Rainer Gerhards | 2012-01-19 | 6 | -25/+10 |
* | | | Merge branch 'v6-stable-noscoping' into master | Rainer Gerhards | 2012-01-19 | 2 | -27/+27 |
|\| | | |||||
| * | | undoing v6.1 config scoping interface, part I | Rainer Gerhards | 2012-01-18 | 3 | -75/+75 |
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-01-18 | 1 | -1/+21 |
| |\| | |||||
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-01-14 | 13 | -194/+178 |
| |\ \ | |||||
| * \ \ | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-10-21 | 1 | -2/+3 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-09-26 | 3 | -10/+15 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'v5-devel' into master | Rainer Gerhards | 2012-01-18 | 2 | -46/+35 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'v5-stable-elasticsearch' into v5-devel-tmp | Rainer Gerhards | 2012-01-17 | 1 | -0/+3 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | add elasticsearch output module | Nathan Scott | 2012-01-17 | 1 | -0/+3 |
| | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | 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 | 14 | -195/+199 |
| |\| | | | | | |||||
| * | | | | | | omfwd refactor: even more simplification (small one ;)) | Rainer Gerhards | 2012-01-14 | 1 | -2/+1 |
| * | | | | | | 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 'v4-stable-tmp' into v5-devel-tmp | Rainer Gerhards | 2012-01-10 | 1 | -0/+3 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'tmp' into v4-stable-tmp | Rainer Gerhards | 2012-01-10 | 1 | -0/+9 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | added $SpaceLFOnReceive config directive | Tomas Heinrich | 2012-01-10 | 1 | -0/+9 |
| | * | | | | | | | Merge branch 'tmp' into v4-stable-tmp | Rainer Gerhards | 2012-01-10 | 1 | -0/+3 |
| | |\| | | | | | | |||||
| | | * | | | | | | added canned template for ultra-exact sysklogd file format | Tomas Heinrich | 2012-01-10 | 1 | -0/+3 |
* | | | | | | | | | Merge branch 'v5-stable' into master | Rainer Gerhards | 2012-01-18 | 14 | -195/+199 |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-16 | 1 | -1/+21 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| | * | | | | | | | FQDN hostname for multihomed host was not always set to the correct name | Tomas Heinrich | 2012-01-16 | 1 | -2/+22 |
| * | | | | | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-14 | 13 | -194/+178 |
| |\| | | | | | | | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| | * | | | | | | more license analysis & change | Rainer Gerhards | 2012-01-14 | 11 | -178/+163 |
| | * | | | | | | rsyslog.conf.5 socket module example sb imuxsock | Jim Hill | 2012-01-14 | 1 | -1/+1 |
| | * | | | | | | relicense parts under ASL 2.0 | Rainer Gerhards | 2012-01-11 | 1 | -15/+14 |
| | | |/ / / / | | |/| | | | | |||||
* | | | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-10-21 | 1 | -2/+3 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-10-21 | 1 | -2/+3 |
| |\| | | | | | |||||
| | * | | | | | minor: slightly improved error reporting when dynafile open fails | Rainer Gerhards | 2011-10-20 | 1 | -2/+3 |
| | | |_|_|/ | | |/| | | | |||||
* | | | | | | added support for v6 config system to omfwd | Rainer Gerhards | 2011-10-11 | 2 | -73/+232 |
* | | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-09-26 | 3 | -13/+17 |
|\| | | | | | |||||
| * | | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-09-26 | 1 | -10/+13 |
| |\| | | | | |||||
| | * | | | | bugfix: omfile returns fatal error code for things that go really wrong | Rainer Gerhards | 2011-09-26 | 1 | -3/+2 |
| | * | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-09-22 | 2 | -6/+12 |
| | |\| | | |