summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v7-devel'masterRainer Gerhards2013-11-291-44/+44
|\
| * another round of const qualifiers...Rainer Gerhards2013-11-291-44/+44
| |
| * nit: apply const qualifier to some functionsRainer Gerhards2013-11-291-15/+15
| |
* | nit: apply const qualifier to some functionsRainer Gerhards2013-11-291-15/+15
| |
* | Merge branch 'v7-devel' into tmpRainer Gerhards2013-11-2913-72/+200
|\| | | | | | | | | Conflicts: action.c
| * document new global parameterRainer Gerhards2013-11-291-0/+7
| |
| * fix merge problemRainer Gerhards2013-11-291-4/+3
| |
| * Merge branch 'v7-stable' into v7-develRainer Gerhards2013-11-293-0/+39
| |\
| | * doc: create skeleton for global() config objectRainer Gerhards2013-11-293-0/+39
| | |
| * | actions now report if they suspend and resume themselvesRainer Gerhards2013-11-294-11/+21
| | |
| * | add new impstats action counters:Rainer Gerhards2013-11-293-2/+27
| | | | | | | | | | | | | | | | | | * suspended * suspended.duration * resumed
| * | bugfix: action suspend timeout was not increasedRainer Gerhards2013-11-291-3/+6
| | |
| * | emit internal message when action is suspended and resumedRainer Gerhards2013-11-291-6/+16
| | |
| * | nit: update copyright datesRainer Gerhards2013-11-295-5/+5
| | |
| * | introduce new function to emit warning and other non-error messagesRainer Gerhards2013-11-295-48/+84
| | | | | | | | | | | | also refactor the error message subsystem a bit
| * | use const keyword at (some) appropriate placesRainer Gerhards2013-11-297-13/+12
| | |
* | | doc: fix cut&paste errorv8.1.2Rainer Gerhards2013-11-281-1/+1
| | |
* | | preparing for 8.1.2 releaseRainer Gerhards2013-11-283-4/+7
| | |
* | | remove compiler warningRainer Gerhards2013-11-281-1/+1
| | |
* | | Merge branch 'master-lognorm1-noestr'Rainer Gerhards2013-11-281-8/+1
|\ \ \
| * | | mmnormalize: no longer need to duplicate msg text for liblognormRainer Gerhards2013-11-251-8/+1
| | | | | | | | | | | | | | | | | | | | as liblognorm's interface has been changed to support traditional C strings
* | | | Merge branch 'master-lognorm1'Rainer Gerhards2013-11-284-40/+37
|\| | |
| * | | Allow path parameter to place normalized fields as subtreePavel Levshin2013-11-252-1/+29
| | | |
| * | | require 1.0.0 release of liblognormRainer Gerhards2013-11-251-1/+1
| | | | | | | | | | | | | | | | as this is the official name of liblognorm1's first release
| * | | Rewrite mmnormalize to use liblognorm 0.4.0 with JSON interfacePavel Levshin2013-11-253-39/+8
| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/mmnormalize/mmnormalize.c
| * | | revert configure change for patch to applyRainer Gerhards2013-11-251-1/+1
| | | |
* | | | Merge branch 'v7-devel'Rainer Gerhards2013-11-272-1/+5
|\ \ \ \ | | |/ / | |/| | | | | | | | | | Conflicts: ChangeLog
| * | | Merge branch 'c10' into v7-develRainer Gerhards2013-11-272-1/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| | * | | bugfix: mmrfc5424addhmac: "key" parameter was not properly processedRainer Gerhards2013-11-273-2/+3
| | | | |
* | | | | Merge branch 'v7-devel'Rainer Gerhards2013-11-272-8/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/queue.c
| * | | | Merge branch 'v7-stable' into v7-develRainer Gerhards2013-11-272-3/+3
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | doc: remove some implementation detailsRainer Gerhards2013-11-271-2/+2
| | | | |
| * | | | regression fix: action queues with default settings did not start worker threadv7.5.7Rainer Gerhards2013-11-251-5/+3
| | | | |
| * | | | bumping version numberRainer Gerhards2013-11-254-9/+9
| | | | |
* | | | | build system: check if jemalloc is present (if requested)Rainer Gerhards2013-11-271-2/+9
| | | | |
* | | | | output memory allocator in version displayRainer Gerhards2013-11-261-0/+5
| | | | |
* | | | | Merge branch 'master-jemalloc'Rainer Gerhards2013-11-262-0/+18
|\ \ \ \ \
| * | | | | doc: maintain ChangeLogRainer Gerhards2013-11-261-0/+2
| | | | | |
| * | | | | add support for jemalloc (experimental)Rainer Gerhards2013-11-261-0/+16
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslogRainer Gerhards2013-11-2615-50/+279
|\| | | |
| * | | | Merge branch 'v7-stable'Rainer Gerhards2013-11-251-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | prepare for upcoming liblognorm 1.0.0 releaseRainer Gerhards2013-11-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | The new liblognorm relase has an incompatible API, so we cannot use it to compile this version of rsyslog.
| * | | | Merge branch 'v7-devel'Rainer Gerhards2013-11-240-0/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | Conflicts: tests/Makefile.am
| | * | | testbench: add (corrected) test for msg variablesRainer Gerhards2013-11-241-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am
| | * | | testbench: stop-localvar did actually test msg vars - now fixedRainer Gerhards2013-11-241-4/+4
| | | | |
| * | | | testbench: add (corrected) test for msg variablesRainer Gerhards2013-11-241-0/+3
| | | | |
| * | | | testbench: stop-localvar did actually test msg vars - now fixedRainer Gerhards2013-11-241-4/+4
| | | | |
| * | | | Merge branch 'v7-devel'Rainer Gerhards2013-11-231-0/+7
| |\| | |
| | * | | Merge branch 'v7-stable' into v7-develRainer Gerhards2013-11-231-0/+7
| | |\| |
| | | * | doc: add link to new online impstats analyzer toolRainer Gerhards2013-11-221-0/+7
| | | | |