summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-16111-1707/+1571
|\ | | | | | | | | Conflicts: plugins/impstats/impstats.c
| * Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-1665-1001/+882
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/debug.h runtime/obj.c runtime/parser.h runtime/wti.h
| | * license changesRainer Gerhards2012-01-1645-704/+617
| | |
| | * runtime license changeRainer Gerhards2012-01-1620-297/+265
| | |
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-142-35/+30
| |\|
| | * license changeRainer Gerhards2012-01-142-35/+30
| | | | | | | | | | | | after careful consideration of affected code
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-1443-647/+645
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c plugins/omtesting/omtesting.c tcpsrv.c threads.c
| | * more license analysis & changeRainer Gerhards2012-01-1411-178/+163
| | |
| | * rsyslog.conf.5 socket module example sb imuxsockJim Hill2012-01-141-1/+1
| | |
| | * more files moved to ASL 2.0Rainer Gerhards2012-01-124-66/+58
| | |
| | * some more files to ASL 2.0Rainer Gerhards2012-01-117-108/+104
| | |
| | * relicense parts under ASL 2.0Rainer Gerhards2012-01-1120-294/+316
| | | | | | | | | | | | after carful check for copyright holder
| * | relicense to ASL 2.0Rainer Gerhards2012-01-111-24/+14
| | |
* | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-092-5/+7
|\| |
| * | bugfix: instabilities when using RFC5424 header fieldsKaiwang Chen2012-01-092-5/+7
| | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | push version numberRainer Gerhards2012-01-091-1/+1
| | |
* | | imudp: added per-listner stats settings & more refactoringRainer Gerhards2012-01-091-74/+80
| | |
* | | imudp refactor: field renaming (new names more more sense)Rainer Gerhards2012-01-091-20/+19
| | |
* | | imudp refactor: regression fixRainer Gerhards2012-01-091-3/+3
| | |
* | | imudp refactor: fixed socket leakRainer Gerhards2012-01-091-9/+5
| | |
* | | nit fixed (testing aid removed)Rainer Gerhards2012-01-081-2/+1
| | |
* | | cleanup of imudp to use better lstn data structure (part I)Rainer Gerhards2012-01-081-68/+60
| | |
* | | prepared milestone (version push)Rainer Gerhards2011-12-211-1/+1
| | |
* | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2011-12-202-3/+10
|\| | | | | | | | | | | | | | Conflicts: ChangeLog
| * | bugfix: stats counter were not properly initialized on creationRainer Gerhards2011-12-202-0/+3
| | |
| * | bugfix: imuxsock did truncate part of received message if it did not contain ↵Rainer Gerhards2011-12-202-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 countersRainer Gerhards2011-12-203-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 creationRainer Gerhards2011-12-202-0/+3
| | |
* | | imudp: stats addedRainer Gerhards2011-12-191-0/+17
| | |
* | | better performance for action stats & cleanup: removing debug printsRainer Gerhards2011-12-192-7/+6
| | |
* | | flagged special branch versionRainer Gerhards2011-12-191-1/+1
| | |
* | | additional counter for lost messages due to failed actions addedRainer Gerhards2011-12-192-0/+6
| | |
* | | added instrumentationRainer Gerhards2011-12-196-6/+64
|/ /
* | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-12-164-4/+49
|\|
| * bugfix: potential fatal abort in omgssapiTomas Heinrich2011-12-162-4/+4
| |
| * added doc for omprogRainer Gerhards2011-12-163-0/+45
| |
* | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-12-013-2/+5
|\| | | | | | | | | Conflicts: action.c
| * Merge branch 'v3-stable' into v4-stableRainer Gerhards2011-12-013-2/+5
| |\
| | * bugfix: action resume interval incorrectly handled, thus took longer to resumeTomas Heinrich2011-12-012-2/+4
| | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * bugfix: cosmetic: proper constant used instead of number in open callTomas Heinrich2011-12-012-1/+2
| | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-11-031-3/+2
|\| |
| * | doc bugfix: typo in imgssapi docRainer Gerhards2011-11-031-3/+2
| | |
* | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-10-251-1/+3
|\| |
| * | doc: imfile: clarified that empty lines are not processedRainer Gerhards2011-10-251-1/+3
| | |
* | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-10-272-3/+15
|\| | | | | | | | | | | | | | Conflicts: ChangeLog
| * | bugfix: potential abort after reading invalid X.509 certificateTomas Heinrich2011-10-272-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.6Rainer Gerhards2011-10-213-3/+3
| | |
* | | bugfix: missing whitespace after property-based filter was not detectedRainer Gerhards2011-10-215-6/+18
| | |
* | | Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stableRainer Gerhards2011-10-212-5/+5
|\ \ \
| * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-10-202-5/+5
| |\| |