Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | renaming conf.* wasn't a good idea -- undoing | Rainer Gerhards | 2011-04-19 | 1 | -1/+1 |
* | renamed conf.c to legacyconf.c to make room for new config system | Rainer Gerhards | 2011-04-19 | 1 | -1/+1 |
* | Merge branch 'v5-devel' | Rainer Gerhards | 2011-03-31 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2011-03-16 | 1 | -1/+1 |
| |\ | |||||
| | * | fixed a regression of last patch and some cleanup | Rainer Gerhards | 2011-03-16 | 1 | -1/+1 |
* | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-03-11 | 1 | -0/+5 |
|\| | | |||||
| * | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2011-03-08 | 1 | -0/+5 |
| |\| | |||||
| | * | bugfix(kind of): tell users that config graph can currently not be generated | Rainer Gerhards | 2011-03-08 | 1 | -0/+5 |
* | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-02-25 | 1 | -2/+1 |
|\| | | |||||
| * | | cosmetic: removing commented-out testing aid | Rainer Gerhards | 2011-02-25 | 1 | -1/+0 |
| * | | bugfix (minor): warning message suggested invalid compatibility mode | Rainer Gerhards | 2011-02-22 | 1 | -1/+1 |
* | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-02-18 | 1 | -3/+2 |
|\| | | |||||
| * | | cleanup: no longer parameter in iminternal system removed | Rainer Gerhards | 2011-02-16 | 1 | -3/+2 |
* | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-02-11 | 1 | -3/+36 |
|\| | | |||||
| * | | fixed some compile issues in recent systemd patch | Rainer Gerhards | 2011-02-11 | 1 | -1/+1 |
| * | | Improved systemd socket activation support | Marius Tomaschewski | 2011-02-11 | 1 | -3/+36 |
* | | | Merge branch 'v5-devel' | Rainer Gerhards | 2010-12-17 | 1 | -11/+8 |
|\| | | |||||
| * | | Merge branch 'v4-devel' into v5-devel | Rainer Gerhards | 2010-12-17 | 1 | -3/+0 |
| |\ \ | |||||
| | * | | added $LocalHostName config directive & some bugfixing | Rainer Gerhards | 2010-12-16 | 1 | -3/+3 |
| | * | | cleanup of cosmetic nit (result of clang static code analyser run) | Rainer Gerhards | 2010-12-16 | 1 | -1/+1 |
| | * | | Merge branch 'v4-stable' into v4-devel | Rainer Gerhards | 2010-12-16 | 1 | -2/+0 |
| | |\ \ | |||||
| | | * | | some cleanup based on clang static analyzer results | Rainer Gerhards | 2010-12-16 | 1 | -2/+0 |
| * | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2010-12-17 | 1 | -1/+1 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | fixed cosmetic nit (as a result of clang static code analyzer run) | Rainer Gerhards | 2010-12-16 | 1 | -1/+1 |
| | * | | | Merge branch 'v4-devel' into v5-beta | Rainer Gerhards | 2010-10-15 | 1 | -1/+1 |
| | |\| | | |||||
| * | | | | bugfix: one type of 64bit atomics was enabled when 32bit atomics were supported | Rainer Gerhards | 2010-12-02 | 1 | -7/+7 |
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2010-10-05 | 1 | -4/+3 |
|\| | | | | |||||
| * | | | | minor: improved error message when already running | Rainer Gerhards | 2010-09-17 | 1 | -4/+3 |
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2010-09-08 | 1 | -29/+32 |
|\| | | | | |||||
| * | | | | Merge branch 'systemd' into v5-devel | Rainer Gerhards | 2010-09-08 | 1 | -29/+32 |
| |\ \ \ \ | |||||
| | * | | | | acquire /dev/log socket optionally from systemd | Lennart Poettering | 2010-09-07 | 1 | -29/+32 |
* | | | | | | Merge branch 'master' into tmp | Rainer Gerhards | 2010-08-11 | 1 | -1/+4 |
|\| | | | | | |||||
| * | | | | | Merge branch 'v4-devel' into master | Rainer Gerhards | 2010-08-11 | 1 | -1/+1 |
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| | | |||||
| | * | | | Merge branch 'v4-stable-imptcp' into tmp | Rainer Gerhards | 2010-08-11 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * | | | added imptcp | Rainer Gerhards | 2010-08-10 | 1 | -1/+1 |
| | | | |/ | | | |/| | |||||
| | | * | | temporary bugfix replaced by permanent one for... | Rainer Gerhards | 2010-03-31 | 1 | -1/+1 |
| * | | | | changed omudpspoof default spoof address to simplify typical use case | Rainer Gerhards | 2010-08-05 | 1 | -0/+3 |
| | |_|/ | |/| | | |||||
* | | | | added support to save/restore rsyslog core action settings... | Rainer Gerhards | 2010-07-23 | 1 | -5/+0 |
* | | | | moving towards scoping inside rsyslog.conf | Rainer Gerhards | 2010-07-21 | 1 | -50/+50 |
|/ / / | |||||
* | | | milestone(BUGGY): batch now pushed down to action | Rainer Gerhards | 2010-06-15 | 1 | -12/+1 |
* | | | milestone commit(BUGGY): batch is now handed down to rule processing | Rainer Gerhards | 2010-06-10 | 1 | -9/+17 |
* | | | main msg q consumer now preprocesses messages before doing rule processing | Rainer Gerhards | 2010-06-09 | 1 | -25/+47 |
* | | | somewhat improved direct mode queue performance | Rainer Gerhards | 2010-06-09 | 1 | -1/+1 |
* | | | finshed implementation of strgen modules | Rainer Gerhards | 2010-06-04 | 1 | -9/+11 |
* | | | first implementation of strgen interface | Rainer Gerhards | 2010-06-01 | 1 | -0/+4 |
* | | | some more cleanup and a nasty little bug i doDie() | Rainer Gerhards | 2010-05-10 | 1 | -13/+0 |
* | | | Merge branch 'v4-devel' into tmp | Rainer Gerhards | 2010-04-26 | 1 | -0/+20 |
|\| | | |||||
| * | | added new $Sleep directive to hold processing for a couple of seconds during ... | Rainer Gerhards | 2010-04-26 | 1 | -0/+20 |
| * | | Merge branch 'v4-stable-solaris' into v4-devel | Rainer Gerhards | 2010-04-12 | 1 | -12/+29 |
| |\ \ | |||||
| * \ \ | Merge branch 'v4-beta' into tmp | Rainer Gerhards | 2010-01-26 | 1 | -0/+1 |
| |\ \ \ |