Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-01-16 | 111 | -1707/+1571 |
|\ | | | | | | | | | Conflicts: plugins/impstats/impstats.c | ||||
| * | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-16 | 65 | -1001/+882 |
| |\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/debug.h runtime/obj.c runtime/parser.h runtime/wti.h | ||||
| | * | license changes | Rainer Gerhards | 2012-01-16 | 45 | -704/+617 |
| | | | |||||
| | * | runtime license change | Rainer Gerhards | 2012-01-16 | 20 | -297/+265 |
| | | | |||||
| * | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-14 | 2 | -35/+30 |
| |\| | |||||
| | * | license change | Rainer Gerhards | 2012-01-14 | 2 | -35/+30 |
| | | | | | | | | | | | | after careful consideration of affected code | ||||
| * | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-14 | 43 | -647/+645 |
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c plugins/omtesting/omtesting.c tcpsrv.c threads.c | ||||
| | * | 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 |
| | | | |||||
| | * | more files moved to ASL 2.0 | Rainer Gerhards | 2012-01-12 | 4 | -66/+58 |
| | | | |||||
| | * | some more files to ASL 2.0 | Rainer Gerhards | 2012-01-11 | 7 | -108/+104 |
| | | | |||||
| | * | relicense parts under ASL 2.0 | Rainer Gerhards | 2012-01-11 | 20 | -294/+316 |
| | | | | | | | | | | | | after carful check for copyright holder | ||||
| * | | relicense to ASL 2.0 | Rainer Gerhards | 2012-01-11 | 1 | -24/+14 |
| | | | |||||
* | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-01-09 | 2 | -5/+7 |
|\| | | |||||
| * | | bugfix: instabilities when using RFC5424 header fields | Kaiwang Chen | 2012-01-09 | 2 | -5/+7 |
| | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | push version number | Rainer Gerhards | 2012-01-09 | 1 | -1/+1 |
| | | | |||||
* | | | 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 |
| | | | |||||
* | | | prepared milestone (version push) | Rainer Gerhards | 2011-12-21 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2011-12-20 | 2 | -3/+10 |
|\| | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | bugfix: stats counter were not properly initialized on creation | Rainer Gerhards | 2011-12-20 | 2 | -0/+3 |
| | | | |||||
| * | | bugfix: imuxsock did truncate part of received message if it did not contain ↵ | Rainer Gerhards | 2011-12-20 | 2 | -2/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | a proper date. The truncation occured because we removed that part of the messages that was expected to be the date. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=295 | ||||
* | | | imtcp: added stats counters | Rainer Gerhards | 2011-12-20 | 3 | -1/+18 |
| | | | | | | | | | | | | | | | | | | also adds counters to other users of tcpsrv.c method, but these do not work if default submit method is overwritten (currently only the case for imdiag, what we don't consider a problem) | ||||
* | | | bugfix: stats counter were not properly initialized on creation | Rainer Gerhards | 2011-12-20 | 2 | -0/+3 |
| | | | |||||
* | | | imudp: stats added | Rainer Gerhards | 2011-12-19 | 1 | -0/+17 |
| | | | |||||
* | | | better performance for action stats & cleanup: removing debug prints | Rainer Gerhards | 2011-12-19 | 2 | -7/+6 |
| | | | |||||
* | | | flagged special branch version | Rainer Gerhards | 2011-12-19 | 1 | -1/+1 |
| | | | |||||
* | | | additional counter for lost messages due to failed actions added | Rainer Gerhards | 2011-12-19 | 2 | -0/+6 |
| | | | |||||
* | | | added instrumentation | Rainer Gerhards | 2011-12-19 | 6 | -6/+64 |
|/ / | |||||
* | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-12-16 | 4 | -4/+49 |
|\| | |||||
| * | bugfix: potential fatal abort in omgssapi | Tomas Heinrich | 2011-12-16 | 2 | -4/+4 |
| | | |||||
| * | added doc for omprog | Rainer Gerhards | 2011-12-16 | 3 | -0/+45 |
| | | |||||
* | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-12-01 | 3 | -2/+5 |
|\| | | | | | | | | | Conflicts: action.c | ||||
| * | Merge branch 'v3-stable' into v4-stable | Rainer Gerhards | 2011-12-01 | 3 | -2/+5 |
| |\ | |||||
| | * | bugfix: action resume interval incorrectly handled, thus took longer to resume | Tomas Heinrich | 2011-12-01 | 2 | -2/+4 |
| | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| | * | bugfix: cosmetic: proper constant used instead of number in open call | Tomas Heinrich | 2011-12-01 | 2 | -1/+2 |
| | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | 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 |
| | | | |||||
* | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-10-25 | 1 | -1/+3 |
|\| | | |||||
| * | | doc: imfile: clarified that empty lines are not processed | Rainer Gerhards | 2011-10-25 | 1 | -1/+3 |
| | | | |||||
* | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-10-27 | 2 | -3/+15 |
|\| | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | bugfix: potential abort after reading invalid X.509 certificate | Tomas Heinrich | 2011-10-27 | 2 | -3/+10 |
| | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=290 Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | preparing for 5.8.6 releasev5.8.6 | Rainer Gerhards | 2011-10-21 | 3 | -3/+3 |
| | | | |||||
* | | | bugfix: missing whitespace after property-based filter was not detected | Rainer Gerhards | 2011-10-21 | 5 | -6/+18 |
| | | | |||||
* | | | Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stable | Rainer Gerhards | 2011-10-21 | 2 | -5/+5 |
|\ \ \ | |||||
| * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-10-20 | 2 | -5/+5 |
| |\| | |