Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v6-stable-noscoping' into master | Rainer Gerhards | 2012-01-19 | 1 | -12/+12 |
|\ | |||||
| * | undoing v6.1 config scoping interface, part I | Rainer Gerhards | 2012-01-18 | 1 | -11/+11 |
| * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-01-14 | 1 | -15/+14 |
| |\ | |||||
* | \ | Merge branch 'v5-stable' into master | Rainer Gerhards | 2012-01-18 | 1 | -15/+14 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-14 | 1 | -15/+14 |
| |\ \ | |||||
| | * | | more files moved to ASL 2.0 | Rainer Gerhards | 2012-01-12 | 1 | -15/+14 |
* | | | | Merge branch 'beta' | Rainer Gerhards | 2011-10-17 | 1 | -2/+2 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-10-13 | 1 | -2/+2 |
| |\| | | |||||
| | * | | bugfix: imfile did invalid system call under some circumstances | Rainer Gerhards | 2011-10-07 | 1 | -2/+2 |
* | | | | milestone: added module config names | Rainer Gerhards | 2011-07-20 | 1 | -0/+1 |
* | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-06-27 | 1 | -1/+22 |
|\ \ \ \ | |||||
| * | | | | imfile: added $InputFileMaxLinesAtOnce directive | Rainer Gerhards | 2011-05-24 | 1 | -1/+10 |
| * | | | | enhanced imfile to support input batching | Rainer Gerhards | 2011-05-24 | 1 | -1/+13 |
| | |/ / | |/| | | |||||
| * | | | backporting patch for clean make distcheck | Rainer Gerhards | 2011-03-16 | 1 | -0/+8 |
* | | | | imfile is being totally refactored -- add new conf system when done | Rainer Gerhards | 2011-05-20 | 1 | -24/+0 |
* | | | | step: imtcp moved to new config interface | Rainer Gerhards | 2011-05-05 | 1 | -2/+2 |
* | | | | step: put plumbing in place for new input module config system | Rainer Gerhards | 2011-05-03 | 1 | -0/+29 |
* | | | | milestone: ruleset now supports rsconf_t | Rainer Gerhards | 2011-04-19 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | fixed double-free regerssion, probably caused by last merge | Rainer Gerhards | 2011-03-14 | 1 | -5/+0 |
* | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-03-14 | 1 | -0/+8 |
|\ \ \ | |||||
| * | | | fixing cosmetic memory leak in imdiag, imfile | Rainer Gerhards | 2011-03-14 | 1 | -0/+8 |
| |/ / | |||||
* | | | bugfix: very minor memory leak in imfile | Rainer Gerhards | 2011-03-11 | 1 | -0/+5 |
* | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-03-11 | 1 | -0/+1 |
|\| | | |||||
| * | | added work-around for bug in gtls, which causes fd leak when using TLS | Bojan Smojver | 2011-02-23 | 1 | -0/+1 |
* | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-02-18 | 1 | -0/+34 |
|\| | | |||||
| * | | enhance: imfile did not yet support multiple rulesets, now added | Rainer Gerhards | 2011-02-18 | 1 | -0/+34 |
* | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-02-18 | 1 | -3/+3 |
|\| | | |||||
| * | | bugfix: very long running actions could prevent shutdown under some circumsta... | Rainer Gerhards | 2011-02-11 | 1 | -3/+3 |
* | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-02-11 | 1 | -6/+16 |
|\| | | |||||
| * | | enhanced imfile to support non-cancel input termination | Rainer Gerhards | 2011-02-10 | 1 | -6/+16 |
* | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-02-01 | 1 | -1/+7 |
|\| | | |||||
| * | | enhanced imfile to support multi-line messages | David Lang | 2011-01-25 | 1 | -1/+7 |
* | | | Merge branch 'v5-devel' | Rainer Gerhards | 2010-11-25 | 1 | -0/+1 |
|\| | | |||||
| * | | Merge branch 'v5-beta' into v5-devel | Rainer Gerhards | 2010-11-25 | 1 | -0/+1 |
| |\ \ | |||||
| | * | | imfile improvements | Rainer Gerhards | 2010-10-27 | 1 | -3/+17 |
| | * | | Merge branch 'v4-devel' into v5-beta | Rainer Gerhards | 2010-10-15 | 1 | -1/+4 |
| | |\ \ | |||||
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2010-10-20 | 1 | -3/+17 |
|\| | | | | |||||
| * | | | | Merge branch 'v4-devel' into v5-devel | root | 2010-10-20 | 1 | -3/+17 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | imfile improvements | Rainer Gerhards | 2010-10-24 | 1 | -18/+17 |
| | | |/ | | |/| | |||||
| | * | | fixed incomplete merge | Rainer Gerhards | 2010-10-15 | 1 | -0/+1 |
| | * | | imfile: bugfixes in regard to large files (> 2GB) | Rainer Gerhards | 2010-10-15 | 1 | -1/+3 |
* | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2010-10-15 | 1 | -1/+4 |
|\| | | | |||||
| * | | | imfile: bug fixes | Rainer Gerhards | 2010-10-15 | 1 | -1/+4 |
| | |/ | |/| | |||||
* / | | moving towards scoping inside rsyslog.conf | Rainer Gerhards | 2010-07-21 | 1 | -8/+8 |
|/ / | |||||
* | | my imfile cleanup was a bit too agressive ;) | Rainer Gerhards | 2009-10-19 | 1 | -0/+1 |
* | | cosmetic: cleanup of imfile | Rainer Gerhards | 2009-10-16 | 1 | -35/+13 |
* | | removed no longer needed msg_t property "bParseHOSTNAME" | Rainer Gerhards | 2009-10-13 | 1 | -1/+0 |
|/ | |||||
* | finished transition to using inputName property | Rainer Gerhards | 2009-06-30 | 1 | -1/+14 |
* | introduced the idea of detached properties | Rainer Gerhards | 2009-06-29 | 1 | -1/+1 |
* | optimized hostname processing | Rainer Gerhards | 2009-06-23 | 1 | -1/+1 |