Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v6-stable' | Rainer Gerhards | 2012-05-03 | 1 | -1/+37 |
|\ | |||||
| * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-05-03 | 1 | -1/+27 |
| |\ | |||||
| | * | preparing for 5.8.11 releasev5.8.11 | Rainer Gerhards | 2012-05-03 | 1 | -1/+1 |
| | * | bugfix: ommysql did not properly init/exit the mysql runtime library | Rainer Gerhards | 2012-05-03 | 1 | -0/+5 |
| | * | bugfix: rsyslog did not terminate when delayable inputs were blocked | Rainer Gerhards | 2012-05-03 | 1 | -0/+5 |
| | * | bugfix: inside queue.c, some thread cancel states were not correctly reset. | Rainer Gerhards | 2012-05-03 | 1 | -0/+4 |
| | * | bugfix: active input in "light delay state" could block rsyslog termination | Rainer Gerhards | 2012-04-27 | 1 | -0/+2 |
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-04-19 | 1 | -0/+2 |
| |\| | |||||
* | | | bugfix/omfile: template action parameter was not accepted | Rainer Gerhards | 2012-05-03 | 1 | -0/+3 |
* | | | Merge branch 'master-fieldext' | Rainer Gerhards | 2012-04-26 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | added capability to specify substrings for field extraction mode | Rainer Gerhards | 2012-04-26 | 1 | -0/+1 |
* | | | | bugfix: omudpspoof did not work correctly if no spoof hostname was configured | Rainer Gerhards | 2012-04-23 | 1 | -0/+2 |
|/ / / | |||||
* | | | Merge branch 'v5-beta' | Rainer Gerhards | 2012-04-19 | 1 | -0/+4 |
|\ \ \ | |||||
| * \ \ | Merge branch 'v5-stable-newstats' into v5-beta | Rainer Gerhards | 2012-04-19 | 1 | -0/+4 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-19 | 1 | -0/+2 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | doc: added last bugfix to ChangeLog | Rainer Gerhards | 2012-04-19 | 1 | -0/+2 |
| | * | | | doc: add last bugfix to changelog | Rainer Gerhards | 2012-04-19 | 1 | -0/+2 |
| * | | | | Merge branch 'v5-stable-newstats' into v5-beta | Rainer Gerhards | 2012-04-18 | 1 | -0/+4 |
| |\| | | | |||||
| | * | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-18 | 1 | -0/+4 |
| | |\| | | |||||
* | | | | | added the "jsonf" property replacer option (and fieldname) & bugfix | Rainer Gerhards | 2012-04-19 | 1 | -0/+3 |
* | | | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-04-18 | 1 | -0/+8 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-04-18 | 1 | -0/+4 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | bugfix: assigned ruleset was lost when using disk queues | Rainer Gerhards | 2012-04-18 | 1 | -0/+4 |
| * | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-04-12 | 1 | -0/+5 |
| |\| | | | |||||
* | | | | | bugfix/imuxsock: configured hostname was not used | Rainer Gerhards | 2012-04-16 | 1 | -1/+2 |
* | | | | | bugfix/imuxsock: solving abort if hostname was not set | Rainer Gerhards | 2012-04-16 | 1 | -0/+3 |
* | | | | | preparing for 6.3.8 releasev6.3.8 | Rainer Gerhards | 2012-04-16 | 1 | -1/+1 |
* | | | | | Merge branch 'v5-beta' | Rainer Gerhards | 2012-04-12 | 1 | -14/+39 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | preparing for 5.9.6v5.9.6 | Rainer Gerhards | 2012-04-12 | 1 | -2/+5 |
| * | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-04-12 | 1 | -0/+5 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-12 | 1 | -0/+5 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | doc: credits update for last bugfix | Rainer Gerhards | 2012-04-11 | 1 | -1/+2 |
| | | * | | bugfix: hostname was not requeried on HUP | Rainer Gerhards | 2012-04-11 | 1 | -0/+4 |
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2012-04-07 | 1 | -0/+12 |
|\| | | | | |||||
| * | | | | permit size modifiers (k,m,g,...) in integer config parameters | Rainer Gerhards | 2012-04-07 | 1 | -0/+2 |
| * | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-04-07 | 1 | -3/+12 |
| |\| | | | |||||
| * | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-20 | 1 | -0/+4 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-19 | 1 | -0/+3 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-14 | 1 | -0/+3 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-12 | 1 | -1/+11 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2012-03-01 | 1 | -0/+11 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | bugfix: imklog invalidly computed facility and severity | Rainer Gerhards | 2012-03-01 | 1 | -0/+4 |
* | | | | | | | | | | Merge branch 'v5-stable-newstats' | Rainer Gerhards | 2012-04-07 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
| * | | | | | | | | | 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 | 1 | -1/+11 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | milestone: added capability to use a local interface IP address as fromhost-ip | Rainer Gerhards | 2012-03-21 | 1 | -2/+1 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
| * | | | | | | | | | added configuration directive to disable octet-counted framing | Rainer Gerhards | 2012-03-20 | 1 | -0/+1 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| * | | | | | | | | added configuration directive to disable octet-counted framing | Rainer Gerhards | 2012-03-19 | 1 | -0/+2 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-03-14 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-03-12 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ |