summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-1870-1055/+954
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imptcp/imptcp.c
| * | preparing for 5.8.7v5.8.7Rainer Gerhards2012-01-173-3/+5
| | |
| * | licensing updateRainer Gerhards2012-01-161-17/+16
| | |
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-162-1/+23
| |\| | | | | | | | | | | | | Conflicts: tools/syslogd.c
| | * FQDN hostname for multihomed host was not always set to the correct nameTomas Heinrich2012-01-162-2/+24
| | | | | | | | | | | | | | | | | | ..if multiple aliases existed. Thanks to Tomas Heinreich for the patch. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | 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 'v5-stable' into v6-stableRainer Gerhards2012-01-1444-671/+659
|\| | | | | | | | | | | | | | Conflicts: plugins/imtcp/imtcp.c
| * | 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
| | |
* | | 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>
| * | 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
* | | begin preparing for v6-stableRainer Gerhards2012-01-091-1/+1
| | |
* | | 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-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 '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 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 '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 'v5-stable' into betaRainer Gerhards2011-10-272-3/+18
|\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | 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>
* | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-216-9/+22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | 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
| |\ \ \
| * | | | minor: slightly improved error reporting when dynafile open failsRainer Gerhards2011-10-201-2/+3
| | | | |
* | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-213-3/+3
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Conflicts: doc/rsyslog_recording_pri.html
| * | | | 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
| | | |
generated by cgit (git 2.34.1) at 2024-09-28 16:09:58 +0000