Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-19 | 1 | -5/+0 |
|\ | |||||
| * | bugfix: imuxsock did not properly honor $LocalHostIPIF | Rainer Gerhards | 2012-10-19 | 1 | -5/+0 |
* | | build: Drop unused include path | Michael Biebl | 2012-10-18 | 1 | -1/+1 |
* | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-16 | 1 | -8/+2 |
|\| | |||||
| * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-16 | 1 | -8/+2 |
| |\ | |||||
| | * | bugfix: imuxsock truncated head of received message | Rainer Gerhards | 2012-10-16 | 1 | -8/+2 |
| | * | fix problem with cutting first 16 characters from message with bAnnotate on m... | Milan Bartos | 2012-10-10 | 1 | -1/+5 |
* | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-27 | 1 | -10/+119 |
|\ \ \ | |||||
| * | | | Implement input() support in imuxsock | Rainer Gerhards | 2012-09-26 | 1 | -10/+119 |
* | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-12 | 1 | -5/+5 |
|\| | | | |||||
| * | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-12 | 1 | -8/+6 |
| |\| | | |||||
| | * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-09-12 | 1 | -5/+5 |
| | |\| | |||||
| | | * | remove unused variables (if SCM_CREDENTIALS is not available) | Cristian Ionescu-Idbohrn | 2012-09-12 | 1 | -1/+5 |
| | | * | imuxsock: remove incorrect socket option call | Cristian Ionescu-Idbohrn | 2012-09-12 | 1 | -4/+0 |
* | | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-09-11 | 1 | -3/+1 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-09-11 | 1 | -3/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | fix compile problem on FreeBSD | Brad Davis | 2012-09-11 | 1 | -3/+1 |
* | | | | Fix length problem with _CMDLINE | Milan Bartos | 2012-09-11 | 1 | -3/+3 |
* | | | | imuxsock: use CEE root for trusted properties | Rainer Gerhards | 2012-09-10 | 1 | -1/+4 |
* | | | | Don't store uninitialized data in trusted JSON properties | Miloslav Trmač | 2012-09-04 | 1 | -9/+12 |
* | | | | Don't overload length as error code indicator in getTrusted* | Miloslav Trmač | 2012-09-04 | 1 | -12/+6 |
* | | | | imuxsock: changed to use new JSON based system | Rainer Gerhards | 2012-08-27 | 1 | -48/+19 |
| |_|/ |/| | | |||||
* | | | Fix undefined ctxee problem | Milan Bartos | 2012-08-21 | 1 | -2/+4 |
* | | | Add support for parsing trusted properties | Milan Bartos | 2012-08-21 | 1 | -30/+121 |
* | | | Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslog | Rainer Gerhards | 2012-08-02 | 1 | -1/+5 |
|\ \ \ | |||||
| * | | | Merge branch 'beta' | Rainer Gerhards | 2012-08-01 | 1 | -1/+5 |
| |\| | | |||||
| | * | | fix problem with cutting first 16 characters from message with bAnnotate on m... | Milan Bartos | 2012-08-01 | 1 | -1/+5 |
* | | | | Fix $SystemLogSocketAnnotate | Miloslav Trmač | 2012-07-31 | 1 | -3/+2 |
|/ / / | |||||
* | | | imuxsock: support for module() global config parameters added | Rainer Gerhards | 2012-06-27 | 1 | -47/+128 |
* | | | implemented freeCnf() module interface & fixed some mem leaks | Rainer Gerhards | 2012-06-25 | 1 | -0/+8 |
* | | | added --enable-debugless configure option for very high demanding environments | Rainer Gerhards | 2012-05-29 | 1 | -10/+8 |
|/ / | |||||
* | | bugfix/imuxsock: configured hostname was not used | Rainer Gerhards | 2012-04-16 | 1 | -0/+1 |
* | | bugfix/imuxsock: solving abort if hostname was not set | Rainer Gerhards | 2012-04-16 | 1 | -2/+2 |
* | | imuxsock: mini bugfix: closed fd was tried to close a second time | Rainer Gerhards | 2012-04-13 | 1 | -3/+6 |
* | | Merge branch 'v5-beta' | Rainer Gerhards | 2012-04-12 | 1 | -6/+5 |
|\| | |||||
| * | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-04-12 | 1 | -8/+7 |
| |\ | |||||
| | * | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-12 | 1 | -8/+7 |
| | |\ | |||||
| | | * | imuxsock: do not cache hostname | Rainer Gerhards | 2012-04-12 | 1 | -10/+4 |
| * | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-04-07 | 1 | -26/+1 |
| |\| | | |||||
| * | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-14 | 1 | -0/+3 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-12 | 1 | -5/+30 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2012-03-02 | 1 | -2/+5 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2012-03-01 | 1 | -0/+9 |
| |\ \ \ \ \ \ | |||||
* | | | | | | | | imuxsock: fixed regression from last merge | Rainer Gerhards | 2012-04-11 | 1 | -0/+7 |
* | | | | | | | | Merge branch 'v5-stable-newstats' | Rainer Gerhards | 2012-04-07 | 1 | -4/+2 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | unified use of $LocalHostIPIF among all locally-emitting inputs | Rainer Gerhards | 2012-03-22 | 1 | -26/+1 |
| | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-03-14 | 1 | -0/+3 |
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | / | | | |_|_|/ | | |/| | | | |||||
| * | | | | | imuxsock did ignore configured IP if - always used eth0 if one was set ;) | Rainer Gerhards | 2012-03-10 | 1 | -1/+1 |
| * | | | | | added capability to use a local interface IP address as fromhost-ip for imuxsock | Rainer Gerhards | 2012-03-06 | 1 | -5/+30 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-03-17 | 1 | -0/+3 |
|\ \ \ \ \ |