summaryrefslogtreecommitdiffstats
path: root/runtime
Commit message (Expand)AuthorAgeFilesLines
* refactor: removing dead apc codeRainer Gerhards2012-01-195-465/+0
* refactor: remove very old sync.[ch] system for "abstracting" mutex accessRainer Gerhards2012-01-193-105/+0
* refactor: removing v6.1 scoping codeRainer Gerhards2012-01-192-140/+12
* v6.1/2 scoping support removed from pluginsRainer Gerhards2012-01-191-34/+3
* Merge branch 'v6-stable'Rainer Gerhards2012-01-194-16/+4
|\
| * removing the newScope/resumeScope macro interfacesRainer Gerhards2012-01-194-16/+4
* | Merge branch 'v6-stable-noscoping' into masterRainer Gerhards2012-01-198-85/+76
|\|
| * undoing v6.1 config scoping interface, part IRainer Gerhards2012-01-187-37/+28
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-1867-1036/+912
| |\
* | \ Merge branch 'v5-devel' into masterRainer Gerhards2012-01-182-1/+11
|\ \ \
| * \ \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-01-1667-1036/+912
| |\ \ \
| | * \ \ Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-1667-1036/+912
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-091-5/+5
| | |\ \ \
| * | | | | part of merge, but forgot to add to merge setRainer Gerhards2012-01-101-0/+3
| * | | | | Merge branch 'v4-stable-tmp' into v5-devel-tmpRainer Gerhards2012-01-101-1/+5
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'tmp' into v4-stable-tmpRainer Gerhards2012-01-101-1/+5
| | |\ \ \ \ \
| | | * | | | | added $SpaceLFOnReceive config directiveTomas Heinrich2012-01-101-1/+5
| * | | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2012-01-091-5/+5
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
* | | | | | | | Merge branch 'v5-stable' into masterRainer Gerhards2012-01-1853-812/+716
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | 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 'v6-stable'Rainer Gerhards2012-01-091-5/+5
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-092-5/+7
| |\| | | | |
| | * | | | | bugfix: instabilities when using RFC5424 header fieldsKaiwang Chen2012-01-091-5/+5
| | * | | | | bugfix: stats counter were not properly initialized on creationRainer Gerhards2011-12-201-0/+2
* | | | | | | Merge branch 'beta'Rainer Gerhards2012-01-091-0/+5
|\| | | | | |
| * | | | | | removing $Begin, $End, $StrictScoping directivesRainer Gerhards2012-01-091-0/+5
* | | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-12-201-0/+2
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-201-0/+2
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | bugfix: stats counter were not properly initialized on creationRainer Gerhards2011-12-201-0/+2
* | | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-12-193-4/+11
|\| | | | | |
| * | | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-191-4/+0
| |\| | | | |
| | * | | | | better performance for action stats & cleanup: removing debug printsRainer Gerhards2011-12-191-4/+0
| * | | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-191-3/+7
| |\| | | | |
| | * | | | | added instrumentationRainer Gerhards2011-12-192-1/+12
| | | |/ / / | | |/| | |
| * | | | | experimental: added first stats counter to action objectRainer Gerhards2011-12-161-1/+1
| * | | | | more work on queue statistics counterRainer Gerhards2011-12-162-5/+10
| * | | | | new stats counter "discarded" for queue objectRainer Gerhards2011-12-162-0/+6
* | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-12-162-38/+53
|\| | | | |
| * | | | | enhanced module loader to not rely on PATH_MAXRainer Gerhards2011-12-161-34/+46
| * | | | | one further change to support gnutls without libgcryptRainer Gerhards2011-10-211-0/+2
* | | | | | Merge branch 'beta'Rainer Gerhards2011-12-121-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-12-011-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-12-011-1/+1
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge branch 'v3-stable' into v4-stableRainer Gerhards2011-12-011-1/+1
| | | |\ \ \
| | | | * | | bugfix: cosmetic: proper constant used instead of number in open callTomas Heinrich2011-12-011-1/+1
* | | | | | | Merge branch 'beta'Rainer Gerhards2011-10-272-4/+8
|\| | | | | |