summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v5-stable' into masterRainer Gerhards2012-01-18100-1502/+1418
|\
| * 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 '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
* | | finally cleaning up the syslog-ng rsyslog comparisonRainer Gerhards2012-01-091-112/+123
* | | removed imtemplate/omtemplate template modules, as this was waste of timeRainer Gerhards2012-01-097-770/+5
* | | Merge branch 'v6-stable'Rainer Gerhards2012-01-092-5/+9
|\ \ \
| * | | 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
| * | | begin preparing for v6-stableRainer Gerhards2012-01-091-1/+1
* | | | Merge branch 'beta'Rainer Gerhards2012-01-096-43/+12
|\| | |
| * | | removing $Begin, $End, $StrictScoping directivesRainer Gerhards2012-01-096-44/+11
* | | | Merge branch 'v5-devel'Rainer Gerhards2011-12-206-10/+34
|\ \ \ \
| * \ \ \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-206-10/+34
| |\ \ \ \
| | * \ \ \ Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2011-12-202-3/+10
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | 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
| | * | | | imtcp: added stats countersRainer Gerhards2011-12-203-1/+18
| | * | | | bugfix: stats counter were not properly initialized on creationRainer Gerhards2011-12-202-0/+3
* | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-12-199-14/+100
|\| | | | |
| * | | | | 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
| |\| | | |
| | * | | | 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
| |\| | | |
| | * | | | 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
* | | | | Merge branch 'v5-devel'Rainer Gerhards2011-12-165-49/+250
|\| | | |
| * | | | 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