summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-03-012-2/+4
|\
| * bugfix: imklog invalidly computed facility and severityRainer Gerhards2012-03-012-2/+4
| | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=313
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-02-031-16/+14
|\|
| * Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-02-031-16/+14
| |\
| | * ommysql: put under ASL 2.0Rainer Gerhards2012-02-031-16/+14
| | | | | | | | | | | | after getting OK via email from contributor Ariel P. (2012-02-02 22:06 CET)
* | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-02-010-0/+0
|\| |
| * | undoing last commit: wrong branchRainer Gerhards2012-01-301-1/+1
| | |
| * | indicated special versionRainer Gerhards2012-01-301-1/+1
| | |
* | | omgssapi: made recompile againRainer Gerhards2012-02-011-4/+4
| | | | | | | | | | | | | | | | | | but this version seems to have a problem, a fix as part of a rewrite is underway. Just wanted to keep things in the same state as before the interface change.
* | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-278-48/+69
|\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/omprog/omprog.c runtime/rsyslog.h
| * | added merged v4 bugfix info to changelogRainer Gerhards2012-01-271-0/+4
| | |
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-277-47/+59
| |\|
| | * bugfix: omprog made rsyslog abort on startup if not binary to execute was ↵Rainer Gerhards2012-01-273-0/+9
| | | | | | | | | | | | configured
| | * relicense unlimited_select.h under ASL 2.0Rainer Gerhards2012-01-261-15/+14
| | | | | | | | | | | | | | | after receiving permission from Red Hat legal (given in email from Tomas Heinrich)
| | * increased max config file line size to 64kRainer Gerhards2012-01-242-1/+7
| | | | | | | | | | | | | | | We now also emit an error message if even 64k is not enough (not doing so previously may rightfully be considered as a bug)
| | * licensing changeRainer Gerhards2012-01-212-31/+29
| | |
| * | mentioning license change in ChangeLogRainer Gerhards2012-01-211-0/+1
| | |
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-212-0/+3
| |\|
| | * license docs were not properly redistributedRainer Gerhards2012-01-212-0/+3
| | | | | | | | | | | | thanks to Tomas Heinrich for alerting me.
* | | mentioning license change in ChangeLogRainer Gerhards2012-01-211-0/+1
| | |
* | | removing the newScope/resumeScope macro interfacesRainer Gerhards2012-01-194-16/+4
| | | | | | | | | | | | to make using pre-v6-plugins even easier
* | | undoing v6.1 config scoping interface, part II (now finished)Rainer Gerhards2012-01-1915-65/+65
| | | | | | | | | | | | | | | | | | This concludes the removal of the new scoping interface, at least as far as pre v6-plugins are affected. Full code cleanup will happen in the v6.3 branch.
* | | undoing v6.1 config scoping interface, part IRainer Gerhards2012-01-1825-235/+235
| | | | | | | | | | | | The most common files are now changed, more needs to be done.
* | | 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
| |\|
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-04 11:38:51 +0000