Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-23 | 1 | -1/+1 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | |||||
| * | | | | | remove "last message repeated n times" from rsyslog output part | Rainer Gerhards | 2012-10-23 | 1 | -75/+3 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'beta' into master-ratelimit | Rainer Gerhards | 2012-10-22 | 1 | -8/+1 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | ratelimit: add default ratelimiter | Rainer Gerhards | 2012-10-19 | 1 | -4/+14 | |
| | | | | | | | ||||||
| * | | | | | | cleanup | Rainer Gerhards | 2012-10-19 | 1 | -38/+0 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-19 | 3 | -40/+11 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | |||||
| * | | | | | | | ratelimit: added linux-like ratelimiter type | Rainer Gerhards | 2012-10-15 | 1 | -1/+0 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-15 | 3 | -5/+10 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/v7compatibility.html | |||||
| * | | | | | | | | ratelimiter: enable thread-safe mode & (related) API changes | Rainer Gerhards | 2012-10-15 | 1 | -32/+0 | |
| | | | | | | | | | ||||||
| * | | | | | | | | interface cleanup (probably not final) | Rainer Gerhards | 2012-10-15 | 1 | -11/+12 | |
| | | | | | | | | | ||||||
| * | | | | | | | | milestone: ratelimiter used in imptcp | Rainer Gerhards | 2012-10-15 | 1 | -0/+43 | |
| | | | | | | | | | ||||||
| * | | | | | | | | new ratelimit: interface plumbing added | Rainer Gerhards | 2012-10-09 | 1 | -5/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | no actual implementation yet done | |||||
* | | | | | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-10-30 | 1 | -1/+4 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html | |||||
| * | | | | | | | | bugfix: omfwd did not properly support "template" parameter | Rainer Gerhards | 2012-10-30 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We also added a testbench test to check for this in the future. That in turn required new testbench tools. | |||||
* | | | | | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-10-27 | 2 | -1/+13 | |
|\| | | | | | | | | |_|_|_|_|/ / / |/| | | | | | | | ||||||
| * | | | | | | | add -D rsyslogd option to enable config parser debug mode | Rainer Gerhards | 2012-10-27 | 2 | -1/+13 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-10-23 | 1 | -1/+1 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | |||||
| * | | | | | | | prepare for 7.20 stable release & minor thingsv7.2.0 | Rainer Gerhards | 2012-10-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
* | | | | | | | | re-enable deprecated warings for omdiscard/omruleset | Rainer Gerhards | 2012-10-22 | 1 | -4/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge for action list functionality will follow soon | |||||
* | | | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-22 | 2 | -8/+5 | |
|\| | | | | | | | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | disable deprecated warnings in omdiscard/omruleset | Rainer Gerhards | 2012-10-22 | 1 | -0/+4 | |
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... 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 manpage | Rainer Gerhards | 2012-10-22 | 1 | -8/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Michael Biebl for mentioning this. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=364 | |||||
* | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-18 | 2 | -3/+3 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | |||||
| * | | | | | build: Drop unused CNF_LIBS variable | Michael Biebl | 2012-10-18 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | doc: typo fix | Rainer Gerhards | 2012-10-17 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-16 | 2 | -38/+9 | |
|\| | | | | | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | |||||
| * | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-16 | 2 | -38/+9 | |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | Conflicts: rsyslog.service.in | |||||
| | * | | | cleanup: removed remains of -c option (compatibility mode) | Rainer Gerhards | 2012-10-16 | 2 | -38/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | both from code & doc and emitted warning message if still used closes: http://bugzilla.adiscon.com/show_bug.cgi?id=361 Thanks to Michael Biebl for reporting & suggestions | |||||
* | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-11 | 2 | -2/+8 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | |||||
| * | | | | add deprecated note to discard action | Rainer Gerhards | 2012-10-11 | 1 | -1/+7 | |
| | | | | | ||||||
| * | | | | fix double-free | Rainer Gerhards | 2012-10-11 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | fix small memory leak when template is specified in omfile | Rainer Gerhards | 2012-10-11 | 1 | -0/+1 | |
| | | | | | ||||||
* | | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-10-11 | 1 | -0/+1 | |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | Conflicts: template.c | |||||
| * | | | | fix small memory leak when template is specified in omfile | Rainer Gerhards | 2012-10-11 | 1 | -0/+1 | |
| | | | | | ||||||
| * | | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-10-04 | 1 | -2/+1 | |
| |\ \ \ \ | | | |/ / | | |/| | | ||||||
* | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-10 | 1 | -3/+1 | |
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | |||||
| * | | | cosmetic cleanup | Rainer Gerhards | 2012-10-09 | 1 | -3/+1 | |
| | | | | ||||||
* | | | | Merge branch 'c1-streamzip' into master-streamzip | Rainer Gerhards | 2012-10-05 | 1 | -3/+12 | |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/rsyslog_conf_global.html runtime/stream.c tools/omfile.c | |||||
| * | | | improved omfile zip writer to increase compression | Rainer Gerhards | 2012-09-14 | 1 | -0/+8 | |
| | | | | | | | | | | | | | | | | | | | | This was achieved by somewhat reducing the robustness of the zip archive. This is controlled by the new setting $OMFileVeryReliableZip. | |||||
* | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-04 | 1 | -2/+1 | |
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | Conflicts: plugins/cust1/Makefile.am | |||||
| * | | | build: don't include librsyslog.la in the dist tarball | Michael Biebl | 2012-10-04 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | libtool archives are not meant to be shipped in the source tarball. | |||||
| * | | | bugfix: config validation run did not always return correct return state | Rainer Gerhards | 2012-09-20 | 1 | -0/+1 | |
| | | | | ||||||
* | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-10-02 | 2 | -0/+468 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | integrate logctl into build process | Rainer Gerhards | 2012-10-02 | 2 | -456/+468 | |
| | | | | ||||||
| * | | | add new tool "logctl" to access lumberjack logs in MongoDB | Ulrike Gerhards | 2012-10-02 | 1 | -0/+456 | |
| | | | | ||||||
* | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-20 | 1 | -0/+1 | |
|\| | | | ||||||
| * | | | bugfix: config validation run did not always return correct return state | Rainer Gerhards | 2012-09-20 | 1 | -0/+1 | |
| | | | | ||||||
* | | | | bugfix: omfile action did not respect "template" parameter | Rainer Gerhards | 2012-09-19 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | ... and used default template in all cases | |||||
* | | | | correct library link order | Rainer Gerhards | 2012-09-11 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | Thanks to Evgeny Turnaev for alerting us on the problem and providing hits to the solution. | |||||
* | | | | Merge branch 'master' into master-newruleset | Rainer Gerhards | 2012-09-06 | 2 | -1/+11 | |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: runtime/rsconf.c |