Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v5-stable-newstats' | Rainer Gerhards | 2012-04-07 | 5 | -2/+39 |
|\ | |||||
| * | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-07 | 1 | -1/+1 |
| |\ | |||||
| * \ | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-07 | 2 | -1/+6 |
| |\ \ | |||||
| * | | | milestone: added capability to use a local interface IP address as fromhost-ip | Rainer Gerhards | 2012-03-21 | 1 | -0/+13 |
| * | | | added configuration directive to disable octet-counted framing | Rainer Gerhards | 2012-03-20 | 1 | -0/+6 |
| * | | | added configuration directive to disable octet-counted framing | Rainer Gerhards | 2012-03-19 | 1 | -0/+6 |
| * | | | added capability to use a local interface IP address as fromhost-ip for imklog | Rainer Gerhards | 2012-03-10 | 2 | -1/+6 |
| * | | | added capability to use a local interface IP address as fromhost-ip for imuxsock | Rainer Gerhards | 2012-03-06 | 1 | -1/+6 |
| * | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-03-05 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-01-24 | 1 | -1/+1 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'v6-stable' | Rainer Gerhards | 2012-04-07 | 1 | -0/+5 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-04-07 | 1 | -0/+5 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | preparing for 5.8.10v5.8.10 | Rainer Gerhards | 2012-04-07 | 1 | -1/+1 |
| | | |_|_|/ | | |/| | | | |||||
| | * | | | | doc: noted disk queue format change from v4->v5 | Rainer Gerhards | 2012-04-05 | 1 | -0/+5 |
| | * | | | | preparing for 5.8.9v5.8.9 | Rainer Gerhards | 2012-03-15 | 1 | -1/+1 |
| | | |_|/ | | |/| | | |||||
| | * | | | preparing for 5.8.8v5.8.8 | Rainer Gerhards | 2012-03-05 | 1 | -1/+1 |
| | | |/ | | |/| | |||||
| | * | | preparing for 5.8.7v5.8.7 | Rainer Gerhards | 2012-01-17 | 1 | -1/+1 |
| * | | | final prep for 6.2.0v6.2.0 | Rainer Gerhards | 2012-01-09 | 1 | -1/+1 |
* | | | | impstats: added $PStatsJSON directive | Rainer Gerhards | 2012-04-01 | 1 | -0/+4 |
* | | | | added "date-unixtimestamp" property replacer option to format as a unix times... | Rainer Gerhards | 2012-03-29 | 1 | -0/+4 |
* | | | | added "json" property replacer option | Rainer Gerhards | 2012-03-16 | 1 | -0/+6 |
* | | | | added message property parsesuccess to indicate status of higher level parser... | Rainer Gerhards | 2012-03-15 | 1 | -0/+19 |
* | | | | upgraded omlibdbi to support the new v6 config format | Rainer Gerhards | 2012-02-02 | 1 | -22/+34 |
* | | | | ommysql: updated doc | Rainer Gerhards | 2012-02-02 | 1 | -16/+30 |
* | | | | preparing for 6.3.7 | Rainer Gerhards | 2012-01-31 | 1 | -1/+1 |
* | | | | Merge branch 'v5-devel' into master | Rainer Gerhards | 2012-01-18 | 3 | -1/+9 |
|\ \ \ \ | |||||
| * | | | | $IMUXSockRateLimitInterval DEFAULT CHANGED, was 5, now 0 | Rainer Gerhards | 2012-01-16 | 1 | -1/+4 |
| * | | | | Merge branch 'v4-stable-tmp' into v5-devel-tmp | Rainer Gerhards | 2012-01-10 | 2 | -0/+5 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'tmp' into v4-stable-tmp | Rainer Gerhards | 2012-01-10 | 1 | -0/+1 |
| | |\ \ \ \ | |||||
| | | * | | | | added $SpaceLFOnReceive config directive | Tomas Heinrich | 2012-01-10 | 1 | -0/+1 |
| | * | | | | | Merge branch 'tmp' into v4-stable-tmp | Rainer Gerhards | 2012-01-10 | 1 | -0/+4 |
| | |\| | | | | |||||
| | | * | | | | added canned template for ultra-exact sysklogd file format | Tomas Heinrich | 2012-01-10 | 1 | -0/+4 |
* | | | | | | | finally cleaning up the syslog-ng rsyslog comparison | Rainer Gerhards | 2012-01-09 | 1 | -112/+123 |
* | | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-01-09 | 4 | -43/+2 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | removing $Begin, $End, $StrictScoping directives | Rainer Gerhards | 2012-01-09 | 4 | -43/+2 |
* | | | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-12-19 | 1 | -1/+3 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2011-12-19 | 4 | -4/+49 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | added instrumentation | Rainer Gerhards | 2011-12-19 | 1 | -1/+3 |
| | | |_|_|/ | | |/| | | | |||||
| * | | | | | more work on queue statistics counter | Rainer Gerhards | 2011-12-16 | 1 | -1/+3 |
* | | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-12-16 | 1 | -5/+23 |
|\| | | | | | |||||
| * | | | | | preparing for 5.9.4v5.9.4 | Rainer Gerhards | 2011-11-29 | 1 | -1/+1 |
| * | | | | | imuxsock: added capability to "annotate" messages with "trusted information", | Rainer Gerhards | 2011-11-29 | 1 | -5/+23 |
* | | | | | | Merge branch 'beta' | Rainer Gerhards | 2011-12-16 | 2 | -0/+44 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-12-16 | 2 | -0/+44 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-12-16 | 2 | -0/+44 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | added doc for omprog | Rainer Gerhards | 2011-12-16 | 2 | -0/+44 |
* | | | | | | Merge branch 'beta' | Rainer Gerhards | 2011-12-12 | 2 | -4/+5 |
|\| | | | | | |||||
| * | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-12-01 | 1 | -3/+2 |
| |\| | | | | |||||
| | * | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-11-03 | 1 | -3/+2 |
| | |\| | | | |||||
| | | * | | | doc bugfix: typo in imgssapi doc | Rainer Gerhards | 2011-11-03 | 1 | -3/+2 |