Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | experimental: added first stats counter to action object | Rainer Gerhards | 2011-12-16 | 3 | -7/+47 | |
| | | | | | | ||||||
| * | | | | | more work on queue statistics counter | Rainer Gerhards | 2011-12-16 | 4 | -8/+15 | |
| | | | | | | ||||||
| * | | | | | new stats counter "discarded" for queue object | Rainer Gerhards | 2011-12-16 | 4 | -1/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Tells how many messages have been discarded due to queue full condition. | |||||
* | | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-12-16 | 5 | -49/+250 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c runtime/modules.c | |||||
| * | | | | | enhanced module loader to not rely on PATH_MAX | Rainer Gerhards | 2011-12-16 | 2 | -34/+49 | |
| | | | | | | ||||||
| * | | | | | preparing for 5.9.4v5.9.4 | Rainer Gerhards | 2011-11-29 | 3 | -3/+3 | |
| | | | | | | ||||||
| * | | | | | imuxsock: added capability to "annotate" messages with "trusted information", | Rainer Gerhards | 2011-11-29 | 3 | -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 libgcrypt | Rainer Gerhards | 2011-10-21 | 1 | -0/+2 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'beta' | Rainer Gerhards | 2011-12-16 | 4 | -4/+49 | |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | ||||||
| * | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-12-16 | 4 | -4/+49 | |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | ||||||
| | * | | | | 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 'beta' | Rainer Gerhards | 2011-12-12 | 5 | -6/+10 | |
|\| | | | | | ||||||
| * | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-12-01 | 4 | -5/+7 | |
| |\| | | | | ||||||
| | * | | | | 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 'v5-stable' into beta | Rainer Gerhards | 2011-10-25 | 1 | -1/+3 | |
| |\| | | | | | ||||||
| | * | | | | | 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 'beta' | Rainer Gerhards | 2011-10-27 | 6 | -34/+84 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/v6compatibility.html | |||||
| * | | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-10-27 | 2 | -3/+18 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | |||||
| | * | | | | | 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> | |||||
| * | | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-10-21 | 6 | -9/+22 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | |||||
| * | | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-10-21 | 3 | -3/+3 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/rsyslog_recording_pri.html | |||||
| * | | | | | | | bugfix (kind of): removed numerical part from pri-text | Rainer Gerhards | 2011-10-21 | 4 | -27/+72 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | see v6 compatibility document for reasons | |||||
* | | | | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-10-21 | 11 | -19/+42 | |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | |||||
| * | | | | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-10-21 | 9 | -16/+30 | |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h | |||||
| | * | | | | | | 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 | |
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | | | ||||||
| | | | * | | | | doc bugfix: pri-text neees to be fixed in an article as well | Rainer Gerhards | 2011-10-20 | 1 | -3/+3 | |
| | | | | | | | | ||||||
| | | | * | | | | doc bug: property pri-text was incorrectly described | Rainer Gerhards | 2011-10-20 | 1 | -2/+2 | |
| | | | | | | | | ||||||
| | * | | | | | | minor: slightly improved error reporting when dynafile open fails | Rainer Gerhards | 2011-10-20 | 1 | -2/+3 | |
| | |/ / / / / | ||||||
| | * | | | | | bugfix: $OMFileFlushInterval period was doubled - now using correct value | Rainer Gerhards | 2011-10-18 | 2 | -1/+2 | |
| | | | | | | | ||||||
| * | | | | | | removed dependency on gcrypt for recently-enough GnuTLS | Rainer Gerhards | 2011-10-17 | 3 | -2/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | see: http://bugzilla.adiscon.com/show_bug.cgi?id=289 | |||||
| * | | | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-10-17 | 7 | -26/+82 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | |||||
* | | | | | | | Merge branch 'beta' | Rainer Gerhards | 2011-10-17 | 7 | -38/+103 | |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | |||||
| * | | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-10-17 | 3 | -10/+17 | |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | ||||||
| | * | | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-10-17 | 1 | -0/+2 | |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | ||||||
| | | * | | | | doc: clarified that imklog does not support Solaris | Rainer Gerhards | 2011-10-17 | 1 | -0/+2 | |
| | | | | | | | ||||||
| | * | | | | | Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stable | Rainer Gerhards | 2011-10-17 | 3 | -9/+54 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | |||||
| | | * | | | | | doc: mention imported bugfix in ChangeLog | Rainer Gerhards | 2011-10-13 | 1 | -0/+2 | |
| | | | | | | | | ||||||
| | | * | | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-10-13 | 2 | -1/+2 | |
| | | |\| | | | |