summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v5-devel'Rainer Gerhards2011-12-199-14/+100
|\
| * Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-191-0/+17
| |\
| | * imudp: stats addedRainer Gerhards2011-12-191-0/+17
| * | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-192-7/+6
| |\|
| | * better performance for action stats & cleanup: removing debug printsRainer Gerhards2011-12-192-7/+6
| | * flagged special branch versionRainer Gerhards2011-12-191-1/+1
| * | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-192-0/+6
| |\|
| | * additional counter for lost messages due to failed actions addedRainer Gerhards2011-12-192-0/+6
| * | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-198-12/+73
| |\|
| | * added instrumentationRainer Gerhards2011-12-196-6/+64
| * | fixing memory leak in new stats code (delete statsobj)Rainer Gerhards2011-12-161-0/+6
| * | experimental: added first stats counter to action objectRainer Gerhards2011-12-163-7/+47
| * | more work on queue statistics counterRainer Gerhards2011-12-164-8/+15
| * | new stats counter "discarded" for queue objectRainer Gerhards2011-12-164-1/+11
* | | Merge branch 'v5-devel'Rainer Gerhards2011-12-165-49/+250
|\| |
| * | enhanced module loader to not rely on PATH_MAXRainer Gerhards2011-12-162-34/+49
| * | preparing for 5.9.4v5.9.4Rainer Gerhards2011-11-293-3/+3
| * | imuxsock: added capability to "annotate" messages with "trusted information",Rainer Gerhards2011-11-293-11/+184
| * | one further change to support gnutls without libgcryptRainer Gerhards2011-10-211-0/+2
* | | Merge branch 'beta'Rainer Gerhards2011-12-164-4/+49
|\ \ \
| * \ \ Merge branch 'v5-stable' into betaRainer Gerhards2011-12-164-4/+49
| |\ \ \ | | | |/ | | |/|
| | * | 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 'beta'Rainer Gerhards2011-12-125-6/+10
|\| | | |
| * | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-12-014-5/+7
| |\| | |
| | * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-12-013-2/+5
| | |\| |
| | | * | 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
| | | | * | bugfix: cosmetic: proper constant used instead of number in open callTomas Heinrich2011-12-012-1/+2
| | * | | | 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 'v5-stable' into betaRainer Gerhards2011-10-251-1/+3
| |\| | | |
| | * | | | 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 'beta'Rainer Gerhards2011-10-276-34/+84
|\| | | | |
| * | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-272-3/+18
| |\| | | |
| | * | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-10-272-3/+15
| | |\| | |
| | | * | | bugfix: potential abort after reading invalid X.509 certificateTomas Heinrich2011-10-272-3/+10
| * | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-216-9/+22
| |\| | | |
| * | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-213-3/+3
| |\ \ \ \ \
| * | | | | | bugfix (kind of): removed numerical part from pri-textRainer Gerhards2011-10-214-27/+72
* | | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-10-2111-19/+42
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-10-219-16/+30
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | 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
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | | * | | doc bugfix: pri-text neees to be fixed in an article as wellRainer Gerhards2011-10-201-3/+3
| | | | * | | doc bug: property pri-text was incorrectly describedRainer Gerhards2011-10-201-2/+2
generated by cgit (git 2.34.1) at 2024-06-20 18:33:36 +0000