summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | 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
* | | 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
* | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-278-48/+69
|\| |
| * | 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 con...Rainer Gerhards2012-01-273-0/+9
| | * relicense unlimited_select.h under ASL 2.0Rainer Gerhards2012-01-261-15/+14
| | * increased max config file line size to 64kRainer Gerhards2012-01-242-1/+7
| | * 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
* | | mentioning license change in ChangeLogRainer Gerhards2012-01-211-0/+1
* | | removing the newScope/resumeScope macro interfacesRainer Gerhards2012-01-194-16/+4
* | | undoing v6.1 config scoping interface, part II (now finished)Rainer Gerhards2012-01-1915-65/+65
* | | undoing v6.1 config scoping interface, part IRainer Gerhards2012-01-1825-235/+235
* | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-1870-1055/+954
|\| |
| * | 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
| |\|
| | * FQDN hostname for multihomed host was not always set to the correct nameTomas Heinrich2012-01-162-2/+24
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-1665-1001/+882
| |\|
| | * 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
* | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-1444-671/+659
|\| |
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-1443-647/+645
| |\|
| | * 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
| * | 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
| * | 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
* | | begin preparing for v6-stableRainer Gerhards2012-01-091-1/+1
* | | removing $Begin, $End, $StrictScoping directivesRainer Gerhards2012-01-096-44/+11
* | | 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