Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v5-devel' into master | Rainer Gerhards | 2012-01-18 | 1 | -3/+11 |
|\ | |||||
| * | Merge branch 'v5-stable-elasticsearch' into v5-devel-tmp | Rainer Gerhards | 2012-01-17 | 1 | -1/+3 |
| |\ | |||||
| * | | $IMUXSockRateLimitInterval DEFAULT CHANGED, was 5, now 0 | Rainer Gerhards | 2012-01-16 | 1 | -0/+9 |
| * | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-01-16 | 1 | -0/+2 |
| |\ \ | |||||
| * | | | cosmetic: cleanup of ChangeLog | Rainer Gerhards | 2012-01-14 | 1 | -2/+0 |
| * | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2012-01-09 | 1 | -0/+2 |
| |\ \ \ | |||||
| * | | | | Merge v5-stable-newstats & manual ChangeLog update | Rainer Gerhards | 2012-01-09 | 1 | -0/+1 |
* | | | | | Merge branch 'v5-stable' into master | Rainer Gerhards | 2012-01-18 | 1 | -1/+5 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | preparing for 5.8.7v5.8.7 | Rainer Gerhards | 2012-01-17 | 1 | -1/+3 |
| | |_|/ | |/| | | |||||
| * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-16 | 1 | -0/+2 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | FQDN hostname for multihomed host was not always set to the correct name | Tomas Heinrich | 2012-01-16 | 1 | -0/+2 |
* | | | | removed imtemplate/omtemplate template modules, as this was waste of time | Rainer Gerhards | 2012-01-09 | 1 | -0/+4 |
* | | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-01-09 | 1 | -0/+4 |
|\ \ \ \ | |||||
| * | | | | final prep for 6.2.0v6.2.0 | Rainer Gerhards | 2012-01-09 | 1 | -1/+1 |
| * | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-01-09 | 1 | -0/+7 |
| |\| | | | |||||
| | * | | | bugfix: instabilities when using RFC5424 header fields | Kaiwang Chen | 2012-01-09 | 1 | -0/+2 |
* | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-01-09 | 1 | -0/+5 |
|\| | | | | |||||
| * | | | | removing $Begin, $End, $StrictScoping directives | Rainer Gerhards | 2012-01-09 | 1 | -1/+4 |
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-12-20 | 1 | -0/+5 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2011-12-20 | 1 | -0/+5 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | bugfix: stats counter were not properly initialized on creation | Rainer Gerhards | 2011-12-20 | 1 | -0/+1 |
| | * | | | bugfix: imuxsock did truncate part of received message if it did not contain ... | Rainer Gerhards | 2011-12-20 | 1 | -0/+4 |
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-12-19 | 1 | -1/+6 |
|\| | | | | |||||
| * | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2011-12-19 | 1 | -1/+15 |
| |\| | | | |||||
| * | | | | more work on queue statistics counter | Rainer Gerhards | 2011-12-16 | 1 | -2/+2 |
| * | | | | new stats counter "discarded" for queue object | Rainer Gerhards | 2011-12-16 | 1 | -0/+4 |
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-12-16 | 1 | -1/+13 |
|\| | | | | |||||
| * | | | | enhanced module loader to not rely on PATH_MAX | Rainer Gerhards | 2011-12-16 | 1 | -0/+3 |
| * | | | | preparing for 5.9.4v5.9.4 | Rainer Gerhards | 2011-11-29 | 1 | -1/+1 |
| * | | | | imuxsock: added capability to "annotate" messages with "trusted information", | Rainer Gerhards | 2011-11-29 | 1 | -0/+4 |
* | | | | | Merge branch 'beta' | Rainer Gerhards | 2011-12-16 | 1 | -1/+4 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-12-16 | 1 | -1/+4 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-12-16 | 1 | -1/+4 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | bugfix: potential fatal abort in omgssapi | Tomas Heinrich | 2011-12-16 | 1 | -1/+3 |
| | | * | | added doc for omprog | Rainer Gerhards | 2011-12-16 | 1 | -0/+1 |
* | | | | | Merge branch 'beta' | Rainer Gerhards | 2011-12-12 | 1 | -0/+3 |
|\| | | | | |||||
| * | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-12-01 | 1 | -0/+3 |
| |\| | | | |||||
| | * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-12-01 | 1 | -0/+3 |
| | |\| | | |||||
| | | * | | Merge branch 'v3-stable' into v4-stable | Rainer Gerhards | 2011-12-01 | 1 | -0/+3 |
| | | |\ \ | |||||
| | | | * | | bugfix: action resume interval incorrectly handled, thus took longer to resume | Tomas Heinrich | 2011-12-01 | 1 | -1/+3 |
| | | | * | | bugfix: cosmetic: proper constant used instead of number in open call | Tomas Heinrich | 2011-12-01 | 1 | -0/+1 |
* | | | | | | Merge branch 'beta' | Rainer Gerhards | 2011-10-27 | 1 | -1/+17 |
|\| | | | | | |||||
| * | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-10-27 | 1 | -1/+12 |
| |\| | | | | |||||
| | * | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-10-27 | 1 | -1/+9 |
| | |\| | | | |||||
| | | * | | | bugfix: potential abort after reading invalid X.509 certificate | Tomas Heinrich | 2011-10-27 | 1 | -1/+4 |
| * | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-10-21 | 1 | -1/+2 |
| |\| | | | | |||||
| * | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-10-21 | 1 | -0/+1 |
| |\ \ \ \ \ | |||||
| * | | | | | | bugfix (kind of): removed numerical part from pri-text | Rainer Gerhards | 2011-10-21 | 1 | -0/+2 |
* | | | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-10-21 | 1 | -2/+5 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-10-21 | 1 | -1/+3 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | |