| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'beta-jsonrt' into master-es | Rainer Gerhards | 2012-10-29 | 2 | -46/+221 |
| |\ | |||||
| | * | omelasticsearch: improved debug logging | Rainer Gerhards | 2012-07-30 | 1 | -2/+5 |
| | * | omelasticsearch: support for writing data errors to local file added | Rainer Gerhards | 2012-07-30 | 2 | -14/+112 |
| | * | omelasticsearch: mileston: bulk reply is parsed | Rainer Gerhards | 2012-07-30 | 1 | -2/+48 |
| | * | omelasticsearch: parse JSON response (in regard to data errors) | Rainer Gerhards | 2012-07-25 | 1 | -37/+65 |
| * | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-10-24 | 1 | -13/+18 |
| |\ \ | |||||
| | * | | ommongodb rate-limits error messages to prevent spamming the syslog | Rainer Gerhards | 2012-10-24 | 1 | -13/+18 |
| * | | | re-enable deprecated warings for omdiscard/omruleset | Rainer Gerhards | 2012-10-22 | 1 | -4/+0 |
| * | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-22 | 1 | -0/+4 |
| |\| | | |||||
| | * | | disable deprecated warnings in omdiscard/omruleset | Rainer Gerhards | 2012-10-22 | 1 | -0/+4 |
| * | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-19 | 1 | -2/+2 |
| |\| | | |||||
| | * | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-19 | 1 | -2/+2 |
| | |\ \ | |||||
| | | * \ | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-19 | 1 | -2/+2 |
| | | |\ \ | |||||
| | | | * | | fix epoll-enabled code to use correct data member for pointers | Rainer Gerhards | 2012-10-19 | 1 | -2/+2 |
| * | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-19 | 1 | -5/+0 |
| |\| | | | | |||||
| | * | | | | 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 |
| * | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-18 | 1 | -1/+1 |
| |\| | | | | |||||
| | * | | | | build: Drop unused include path | Michael Biebl | 2012-10-18 | 1 | -1/+1 |
| * | | | | | Merge branch 'master-newtemplate' | Rainer Gerhards | 2012-10-18 | 1 | -5/+5 |
| |\ \ \ \ \ | |||||
| | * | | | | | refactor tpl processor so that date is queried once per template | Rainer Gerhards | 2012-10-10 | 1 | -5/+5 |
| * | | | | | | imklog: add paramter "keepkerneltimestamp" | Rainer Gerhards | 2012-10-17 | 3 | -13/+18 |
| * | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-17 | 2 | -3/+5 |
| |\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-17 | 2 | -3/+5 |
| | |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | | * | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-17 | 2 | -3/+5 |
| | | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | | * | | | imklog: use memmove instead of memcpy (solaris) | Marius Tomaschewski | 2012-10-17 | 1 | -1/+1 |
| | | | * | | | imklog: use memmove to remove kernel timestamp | Marius Tomaschewski | 2012-10-17 | 1 | -1/+1 |
| | | | * | | | imklog: skip leading spaces in kernel timestamp | Marius Tomaschewski | 2012-10-17 | 1 | -1/+3 |
| * | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-16 | 1 | -8/+2 |
| |\| | | | | | |||||
| | * | | | | | 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 |
| | | * | | | | change lumberjack cookie to "@cee" from "@cee " | Rainer Gerhards | 2012-10-11 | 1 | -1/+1 |
| * | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-11 | 1 | -1/+1 |
| |\| | | | | | |||||
| | * | | | | | Don't require the trailing space in @cee: cookie | Miloslav Trmač | 2012-10-11 | 1 | -1/+1 |
| * | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-11 | 1 | -0/+6 |
| |\| | | | | | |_|_|/ / |/| | | | | |||||
| | * | | | | added deprecated note to omruleset | Rainer Gerhards | 2012-10-11 | 1 | -0/+6 |
| * | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-04 | 2 | -6/+0 |
| |\| | | | | |||||
| | * | | | | re-delete cust1.c plugin dummy file | Rainer Gerhards | 2012-10-04 | 1 | -0/+0 |
| | * | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-04 | 1 | -6/+0 |
| | |\| | | | |||||
| | | * | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-04 | 1 | -6/+0 |
| | | |\| | | |||||
| | | | * | | remove cust1 dummy plugin from build system | Rainer Gerhards | 2012-10-04 | 1 | -6/+0 |
| * | | | | | omlibdbi improvements | Rainer Gerhards | 2012-10-04 | 1 | -26/+125 |
| |/ / / / | |||||
| * | | | | get rid of compiler warning | Rainer Gerhards | 2012-10-02 | 1 | -4/+0 |
| * | | | | cleanup | Rainer Gerhards | 2012-10-02 | 1 | -3/+0 |
| * | | | | mmjsonparse: also add MSG part of message if CEE-parsing fails | Rainer Gerhards | 2012-10-02 | 1 | -10/+10 |
| * | | | | Change mmjsonparse so non-json messages doesn't get lost from ceelog | Milan Bartos | 2012-10-02 | 1 | -0/+9 |
| * | | | | implement imtcp "permittedPeers" module-global parameter | Rainer Gerhards | 2012-10-01 | 1 | -4/+20 |
| * | | | | implement string arrays for config objects | Rainer Gerhards | 2012-10-01 | 1 | -18/+35 |
 |
index : rsyslog | |
| Modifications to rsyslog---see v3-stable-kaz branch | kaz@kylheku.com |
| summaryrefslogtreecommitdiffstats |