Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | imuxsock: mini bugfix: closed fd was tried to close second time | Rainer Gerhards | 2012-04-13 | 1 | -3/+6 |
* | Merge branch 'v6-stable' | Rainer Gerhards | 2012-03-17 | 1 | -0/+3 |
|\ | |||||
| * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-03-14 | 1 | -1/+4 |
| |\ | |||||
| | * | changed statsobj interface and added better doc | Rainer Gerhards | 2012-03-14 | 1 | -1/+4 |
* | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-03-02 | 1 | -1/+4 |
|\| | | |||||
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-03-02 | 1 | -2/+5 |
| |\| | |||||
| | * | Fix for "/run/systemd/journal/syslog" detection | Marius Tomaschewski | 2012-03-02 | 1 | -2/+5 |
* | | | screwed up during merge - solving that mess ;) | Rainer Gerhards | 2012-03-01 | 1 | -65/+6 |
* | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-03-01 | 1 | -0/+68 |
|\| | | |||||
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-03-01 | 1 | -0/+9 |
| |\| | |||||
| | * | Detect if to use /run/systemd/journal/syslog under systemd | Marius Tomaschewski | 2012-03-01 | 1 | -0/+9 |
* | | | Merge branch 'v6-stable-noscoping' into master | Rainer Gerhards | 2012-01-19 | 1 | -22/+22 |
|\| | | |||||
| * | | undoing v6.1 config scoping interface, part I | Rainer Gerhards | 2012-01-18 | 1 | -18/+18 |
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-01-09 | 1 | -2/+5 |
| |\| | |||||
| * | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-09-26 | 1 | -5/+10 |
| |\ \ | |||||
| * \ \ | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-05-09 | 1 | -2/+7 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'v5-devel' into master | Rainer Gerhards | 2012-01-18 | 1 | -5/+1 |
|\ \ \ \ \ | |||||
| * | | | | | $IMUXSockRateLimitInterval DEFAULT CHANGED, was 5, now 0 | Rainer Gerhards | 2012-01-16 | 1 | -1/+1 |
| * | | | | | regression fix: imuxsock-received messages were malformed | Rainer Gerhards | 2012-01-12 | 1 | -4/+0 |
* | | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-12-20 | 1 | -9/+9 |
|\| | | | | | |||||
| * | | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2011-12-20 | 1 | -9/+9 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | bugfix: imuxsock did truncate part of received message if it did not contain ... | Rainer Gerhards | 2011-12-20 | 1 | -2/+5 |
| | | |_|/ | | |/| | | |||||
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-12-16 | 1 | -5/+161 |
|\| | | | | |||||
| * | | | | imuxsock: added capability to "annotate" messages with "trusted information", | Rainer Gerhards | 2011-11-29 | 1 | -6/+157 |
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-09-26 | 1 | -4/+9 |
|\| | | | | |||||
| * | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-09-07 | 1 | -4/+9 |
| |\| | | | |||||
| | * | | | bugfix: imuxsock did no longer ignore message-provided timestamp, | Rainer Gerhards | 2011-09-07 | 1 | -5/+10 |
| | | |/ | | |/| | |||||
* | | | | milestone: added module config names | Rainer Gerhards | 2011-07-20 | 1 | -0/+1 |
* | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-06-27 | 1 | -15/+70 |
|\| | | | |||||
| * | | | added support for obtaining timestamp from system for imuxsock | Rainer Gerhards | 2011-06-20 | 1 | -11/+63 |
| |/ / | |||||
* | | | step: imuxsock changed to new config system | Rainer Gerhards | 2011-05-12 | 1 | -143/+249 |
* | | | step: imtcp moved to new config interface | Rainer Gerhards | 2011-05-05 | 1 | -2/+2 |
* | | | step: put plumbing in place for new input module config system | Rainer Gerhards | 2011-05-03 | 1 | -0/+30 |
* | | | Merge branch 'v5-stable' | Rainer Gerhards | 2011-04-27 | 1 | -2/+7 |
|\| | | |/ |/| | |||||
| * | bugfix: rate-limiting inside imuxsock did not work 100% correct | Rainer Gerhards | 2011-04-27 | 1 | -2/+7 |
* | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-03-11 | 1 | -0/+1 |
|\| | |||||
| * | Merge branch 'v5-beta-gtls-fix' into v5-beta | Rainer Gerhards | 2011-03-06 | 1 | -0/+1 |
| |\ | |||||
| | * | added work-around for bug in gtls, which causes fd leak when using TLS | Bojan Smojver | 2011-02-23 | 1 | -0/+1 |
* | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-02-25 | 1 | -5/+17 |
|\| | | |||||
| * | | fixed compile problems on Solaris | Rainer Gerhards | 2011-02-23 | 1 | -0/+4 |
| |/ | |||||
| * | the last fix introduced another regression, fixed now | Rainer Gerhards | 2011-02-22 | 1 | -5/+8 |
| * | bugfix: imuxsock does not sanitization at all (regression) | Rainer Gerhards | 2011-02-22 | 1 | -4/+5 |
| * | fixed dumb but important typo in code... | Rainer Gerhards | 2011-02-21 | 1 | -1/+1 |
| * | bugfix: imuxsock did no longer remove trailing LF | Rainer Gerhards | 2011-02-21 | 1 | -0/+4 |
* | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-02-11 | 1 | -44/+45 |
|\| | |||||
| * | fixed some compile issues in recent systemd patch | Rainer Gerhards | 2011-02-11 | 1 | -2/+2 |
| * | Improved systemd socket activation support | Marius Tomaschewski | 2011-02-11 | 1 | -44/+45 |
* | | Merge branch 'v5-devel' | Rainer Gerhards | 2010-10-15 | 1 | -2/+2 |
|\| | |||||
| * | removed need for math library | Rainer Gerhards | 2010-10-11 | 1 | -2/+2 |
* | | Merge branch 'v5-devel' | Rainer Gerhards | 2010-10-06 | 1 | -3/+15 |
|\| |