Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v7-devel'master | Rainer Gerhards | 2013-11-29 | 1 | -44/+44 |
|\ | |||||
| * | another round of const qualifiers... | Rainer Gerhards | 2013-11-29 | 1 | -44/+44 |
| * | nit: apply const qualifier to some functions | Rainer Gerhards | 2013-11-29 | 1 | -15/+15 |
* | | nit: apply const qualifier to some functions | Rainer Gerhards | 2013-11-29 | 1 | -15/+15 |
* | | Merge branch 'v7-devel' into tmp | Rainer Gerhards | 2013-11-29 | 13 | -72/+200 |
|\| | |||||
| * | document new global parameter | Rainer Gerhards | 2013-11-29 | 1 | -0/+7 |
| * | fix merge problem | Rainer Gerhards | 2013-11-29 | 1 | -4/+3 |
| * | Merge branch 'v7-stable' into v7-devel | Rainer Gerhards | 2013-11-29 | 3 | -0/+39 |
| |\ | |||||
| | * | doc: create skeleton for global() config object | Rainer Gerhards | 2013-11-29 | 3 | -0/+39 |
| * | | actions now report if they suspend and resume themselves | Rainer Gerhards | 2013-11-29 | 4 | -11/+21 |
| * | | add new impstats action counters: | Rainer Gerhards | 2013-11-29 | 3 | -2/+27 |
| * | | bugfix: action suspend timeout was not increased | Rainer Gerhards | 2013-11-29 | 1 | -3/+6 |
| * | | emit internal message when action is suspended and resumed | Rainer Gerhards | 2013-11-29 | 1 | -6/+16 |
| * | | nit: update copyright dates | Rainer Gerhards | 2013-11-29 | 5 | -5/+5 |
| * | | introduce new function to emit warning and other non-error messages | Rainer Gerhards | 2013-11-29 | 5 | -48/+84 |
| * | | use const keyword at (some) appropriate places | Rainer Gerhards | 2013-11-29 | 7 | -13/+12 |
* | | | doc: fix cut&paste errorv8.1.2 | Rainer Gerhards | 2013-11-28 | 1 | -1/+1 |
* | | | preparing for 8.1.2 release | Rainer Gerhards | 2013-11-28 | 3 | -4/+7 |
* | | | remove compiler warning | Rainer Gerhards | 2013-11-28 | 1 | -1/+1 |
* | | | Merge branch 'master-lognorm1-noestr' | Rainer Gerhards | 2013-11-28 | 1 | -8/+1 |
|\ \ \ | |||||
| * | | | mmnormalize: no longer need to duplicate msg text for liblognorm | Rainer Gerhards | 2013-11-25 | 1 | -8/+1 |
* | | | | Merge branch 'master-lognorm1' | Rainer Gerhards | 2013-11-28 | 4 | -40/+37 |
|\| | | | |||||
| * | | | Allow path parameter to place normalized fields as subtree | Pavel Levshin | 2013-11-25 | 2 | -1/+29 |
| * | | | require 1.0.0 release of liblognorm | Rainer Gerhards | 2013-11-25 | 1 | -1/+1 |
| * | | | Rewrite mmnormalize to use liblognorm 0.4.0 with JSON interface | Pavel Levshin | 2013-11-25 | 3 | -39/+8 |
| * | | | revert configure change for patch to apply | Rainer Gerhards | 2013-11-25 | 1 | -1/+1 |
* | | | | Merge branch 'v7-devel' | Rainer Gerhards | 2013-11-27 | 2 | -1/+5 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch 'c10' into v7-devel | Rainer Gerhards | 2013-11-27 | 2 | -1/+4 |
| |\ \ \ | |||||
| | * | | | bugfix: mmrfc5424addhmac: "key" parameter was not properly processed | Rainer Gerhards | 2013-11-27 | 3 | -2/+3 |
* | | | | | Merge branch 'v7-devel' | Rainer Gerhards | 2013-11-27 | 2 | -8/+8 |
|\| | | | | |||||
| * | | | | Merge branch 'v7-stable' into v7-devel | Rainer Gerhards | 2013-11-27 | 2 | -3/+3 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | doc: remove some implementation details | Rainer Gerhards | 2013-11-27 | 1 | -2/+2 |
| * | | | | regression fix: action queues with default settings did not start worker threadv7.5.7 | Rainer Gerhards | 2013-11-25 | 1 | -5/+3 |
| * | | | | bumping version number | Rainer Gerhards | 2013-11-25 | 4 | -9/+9 |
* | | | | | build system: check if jemalloc is present (if requested) | Rainer Gerhards | 2013-11-27 | 1 | -2/+9 |
* | | | | | output memory allocator in version display | Rainer Gerhards | 2013-11-26 | 1 | -0/+5 |
* | | | | | Merge branch 'master-jemalloc' | Rainer Gerhards | 2013-11-26 | 2 | -0/+18 |
|\ \ \ \ \ | |||||
| * | | | | | doc: maintain ChangeLog | Rainer Gerhards | 2013-11-26 | 1 | -0/+2 |
| * | | | | | add support for jemalloc (experimental) | Rainer Gerhards | 2013-11-26 | 1 | -0/+16 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslog | Rainer Gerhards | 2013-11-26 | 15 | -50/+279 |
|\| | | | | |||||
| * | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-11-25 | 1 | -1/+1 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | prepare for upcoming liblognorm 1.0.0 release | Rainer Gerhards | 2013-11-24 | 1 | -1/+1 |
| * | | | | Merge branch 'v7-devel' | Rainer Gerhards | 2013-11-24 | 0 | -0/+0 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | testbench: add (corrected) test for msg variables | Rainer Gerhards | 2013-11-24 | 1 | -0/+3 |
| | * | | | testbench: stop-localvar did actually test msg vars - now fixed | Rainer Gerhards | 2013-11-24 | 1 | -4/+4 |
| * | | | | testbench: add (corrected) test for msg variables | Rainer Gerhards | 2013-11-24 | 1 | -0/+3 |
| * | | | | testbench: stop-localvar did actually test msg vars - now fixed | Rainer Gerhards | 2013-11-24 | 1 | -4/+4 |
| * | | | | Merge branch 'v7-devel' | Rainer Gerhards | 2013-11-23 | 1 | -0/+7 |
| |\| | | | |||||
| | * | | | Merge branch 'v7-stable' into v7-devel | Rainer Gerhards | 2013-11-23 | 1 | -0/+7 |
| | |\| | | |||||
| | | * | | doc: add link to new online impstats analyzer tool | Rainer Gerhards | 2013-11-22 | 1 | -0/+7 |