summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Improve syntax error messages by outputting the error tokenRainer Gerhards2012-10-272-1/+3
|
* Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-10-251-2/+1
|\
| * doc: fix html formattingMichael Biebl2012-10-251-2/+1
| |
* | cleanupRainer Gerhards2012-10-242-3/+1
| |
* | make rsyslog core suspened actions after 10 failures in a rowRainer Gerhards2012-10-243-1/+15
| | | | | | | | | | This was former the case after 1,000 failures and could cause rsyslog to be spammed/ressou
* | ommongodb rate-limits error messages to prevent spamming the syslogRainer Gerhards2012-10-242-13/+22
| | | | | | | | closes (for v7.2): http://bugzilla.adiscon.com/show_bug.cgi?id=366
* | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-10-222-5/+11
|\| | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html template.c
| * preparing for 6.6.0v6.6.0Rainer Gerhards2012-10-225-7/+10
| |
| * Merge branch 'v6-beta' into v6-stableRainer Gerhards2012-10-2288-935/+7279
| |\
| | * Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-192-4/+4
| | |\
| | * | doc: add imported bugfix to ChangeLogRainer Gerhards2012-10-191-0/+3
| | | |
| | * | Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-192-5/+1
| | |\ \
| | * \ \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-176-45/+22
| | |\ \ \
| | * \ \ \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-162-9/+11
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-112-1/+7
| | |\ \ \ \ \
| | * | | | | | preparing for 6.5.1 releasev6.5.1Rainer Gerhards2012-10-113-3/+3
| | | | | | | |
| | * | | | | | remove some assert()'s - valgrind does a better job...Rainer Gerhards2012-10-111-4/+0
| | | | | | | |
| | * | | | | | fix small memory leak with string-type templatesRainer Gerhards2012-10-111-0/+1
| | | | | | | |
| | * | | | | | fix small memory leak when template is specified in omfileRainer Gerhards2012-10-111-0/+1
| | | | | | | |
| | * | | | | | re-enabled commented-out serialization support in debug handlerRainer Gerhards2012-10-111-3/+3
| | | | | | | |
| | * | | | | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-045-29/+2
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-044-0/+32
| | |\ \ \ \ \ \ \
* | | | | | | | | | prepare for 7.20 stable release & minor thingsv7.2.0Rainer Gerhards2012-10-225-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The most important real code chane is the initialization of the epoll control set. This should just be cosmetic (valgrind warnings), as all data we actually use already was properly initialized.
* | | | | | | | | | testbench: -c option no longer existsRainer Gerhards2012-10-221-2/+2
| | | | | | | | | |
* | | | | | | | | | disable deprecated warnings in omdiscard/omrulesetRainer Gerhards2012-10-222-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... because action-like statements in action lists are not supported in 7.1. This will be available in 7.3, but it is too late to do this in 7.1. So we disable the warnings and re-enable them in 7.3. Functionality- wise, this is no problem at all as the legacy constructs are still fully supported. Thanks to forum user "canadaboy" for mentioning this problem.
* | | | | | | | | | doc: remove BSD blocks from rsyslog.conf manpageRainer Gerhards2012-10-221-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Michael Biebl for mentioning this. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=364
* | | | | | | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-221-1/+1
|\| | | | | | | | |
| * | | | | | | | | Merge branch 'v5-stable' into v6-stablev6.4.3.unfinishedRainer Gerhards2012-10-221-1/+1
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | doc: v3 compatibility doc lists invalid config directiveRainer Gerhards2012-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=365
* | | | | | | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-192-4/+4
|\| | | | | | | | |
| * | | | | | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-192-4/+4
| |\| | | | | | | | | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/nsdpoll_ptcp.c
| | * | | | | | | fix epoll-enabled code to use correct data member for pointersRainer Gerhards2012-10-192-4/+4
| | | | | | | | |
* | | | | | | | | doc: add imported bugfix to ChangeLogRainer Gerhards2012-10-191-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | plus some cleanup
* | | | | | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-192-5/+1
|\| | | | | | | |
| * | | | | | | | bugfix: imuxsock did not properly honor $LocalHostIPIFRainer Gerhards2012-10-192-5/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | preparing for 7.1.12 releasev7.1.12Rainer Gerhards2012-10-183-3/+5
| | | | | | | |
* | | | | | | | build: Remove vestiges of the cust1 pluginMichael Biebl2012-10-181-1/+0
| | | | | | | |
* | | | | | | | build: Drop unused include pathMichael Biebl2012-10-181-1/+1
| | | | | | | |
* | | | | | | | build: Drop unused CNF_LIBS variableMichael Biebl2012-10-182-3/+2
| | | | | | | |
* | | | | | | | build: Use pkg-config to check for libcurlMichael Biebl2012-10-181-19/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | curl has shipped that file since 2004.
* | | | | | | | build: Use pkg-config to check for libuuidMichael Biebl2012-10-181-16/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e2fsprogs resp. util-linux(-ng) have shipped that file since at least 2009.
* | | | | | | | build: Don't call AC_SUBST for variables defined by PKG_CHECK_MODULESMichael Biebl2012-10-181-21/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Newer versions of pkg-config do that already. According to pkg-config upstream this change was made around 2005, so it should be rather safe. This change doesn't affect users building from dist tarballs anyway but only if you are building from a Git checkout.
* | | | | | | | doc: typo fixRainer Gerhards2012-10-171-1/+1
| | | | | | | |
* | | | | | | | doc: add (v5-imported) imklog bugfix to ChangeLogRainer Gerhards2012-10-171-0/+3
| | | | | | | |
* | | | | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-173-6/+8
|\| | | | | | |
| * | | | | | | doc: reflect recent (v5-imported) fix in ChangeLogRainer Gerhards2012-10-171-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-173-5/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | | | | preparing for 5.10.1v5.10.1Rainer Gerhards2012-10-173-4/+4
| | | | | | | |
| | * | | | | | imklog: use memmove instead of memcpy (solaris)Marius Tomaschewski2012-10-171-1/+1
| | | | | | | |
| | * | | | | | imklog: use memmove to remove kernel timestampMarius Tomaschewski2012-10-171-1/+1
| | | | | | | |