summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge branch 'v6-stable'Rainer Gerhards2012-01-092-5/+9
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | | final prep for 6.2.0v6.2.0Rainer Gerhards2012-01-092-2/+2
| | | | | | |
| * | | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-094-7/+19
| |\| | | | |
| | * | | | | bugfix: instabilities when using RFC5424 header fieldsKaiwang Chen2012-01-092-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | | | | | begin preparing for v6-stableRainer Gerhards2012-01-091-1/+1
| | | | | | |
* | | | | | | Merge branch 'beta'Rainer Gerhards2012-01-096-43/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/v6compatibility.html
| * | | | | | removing $Begin, $End, $StrictScoping directivesRainer Gerhards2012-01-096-44/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v6.4 will provide the same functionality in a far better way. So we do not want to clutter the code. -------------------------
* | | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-12-206-10/+34
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-206-10/+34
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c
| | * | | | | 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
| | | | | | |
* | | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-12-199-14/+100
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c plugins/imudp/imudp.c
| * | | | | | 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
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| | * | | | | 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
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c
| | * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | Tells how many messages have been discarded due to queue full condition.
* | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-12-165-49/+250
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c runtime/modules.c
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | which contains some properties obtained from the system and as such sure to not be faked. This is inspired by the similiar idea introduced in systemd.
| * | | | | 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
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 resumev3-stableTomas 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 '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
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/v6compatibility.html
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-06 03:00:36 +0000