Rainer Gerhards
19354af62c
mmnormalize: support for v6+ config interface added
2012-11-01 18:12:26 +01:00
Rainer Gerhards
20c57a6d70
prepare for 7.3.2 release
2012-10-30 16:05:55 +01:00
Rainer Gerhards
e711dc6e6b
Merge branch 'master-ratelimit'
2012-10-30 14:59:01 +01:00
Rainer Gerhards
7faeff73dd
Merge branch 'v7-stable'
...
Conflicts:
configure.ac
doc/manual.html
2012-10-30 13:12:39 +01:00
Rainer Gerhards
ad1b93df8a
bugfix: omfwd did not properly support "template" parameter
...
We also added a testbench test to check for this in the future. That
in turn required new testbench tools.
2012-10-30 13:06:20 +01:00
Rainer Gerhards
c7a4fbcc0a
prepare for 7.2.1 release
2012-10-29 15:50:06 +01:00
Rainer Gerhards
fac3c09f04
Merge branch 'v7-stable'
2012-10-27 14:50:06 +02:00
Rainer Gerhards
589744bc57
Merge branch 'v6-stable' into v7-stable
2012-10-25 18:31:32 +02:00
Michael Biebl
02bc178cc2
doc: fix html formatting
2012-10-25 18:31:08 +02:00
Rainer Gerhards
ffe496e2c2
Merge branch 'master' into master-ratelimit
...
Conflicts:
doc/v7compatibility.html
2012-10-24 17:58:03 +02:00
Rainer Gerhards
205114176d
Merge branch 'v7-stable'
2012-10-24 14:45:01 +02:00
Rainer Gerhards
c72a43d280
make rsyslog core suspened actions after 10 failures in a row
...
This was former the case after 1,000 failures and could cause rsyslog
to be spammed/ressou
2012-10-24 13:00:38 +02:00
Rainer Gerhards
6bfc397b09
preparing for 6.6.0
2012-10-22 12:20:18 +02:00
Rainer Gerhards
163acd9d9f
Merge branch 'v6-beta' into v6-stable
2012-10-22 11:41:23 +02:00
Rainer Gerhards
95fefbc12a
prepare for 7.20 stable release & minor things
...
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.
2012-10-22 11:21:01 +02:00
Rainer Gerhards
b1635a867e
Merge branch 'beta'
2012-10-22 10:22:49 +02:00
Rainer Gerhards
9fb39ee798
Merge branch 'beta' into master-ratelimit
2012-10-22 09:27:31 +02:00
Rainer Gerhards
ff9ad0de55
Merge branch 'v6-stable' into beta
2012-10-22 09:15:41 +02:00
Rainer Gerhards
bee73d2d93
Merge branch 'v5-stable' into v6-stable
2012-10-22 09:12:06 +02:00
Rainer Gerhards
6569ae456b
doc: v3 compatibility doc lists invalid config directive
...
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=365
2012-10-22 09:11:30 +02:00
Rainer Gerhards
e65473e9a4
Merge branch 'master' into master-ratelimit
...
Conflicts:
ChangeLog
configure.ac
doc/manual.html
2012-10-19 09:39:29 +02:00
Florian Riedl
8d80f53c2b
doc: improve module doc
2012-10-19 08:30:45 +02:00
Rainer Gerhards
386b0be7ea
prepare for 7.3.1 release
2012-10-19 08:27:50 +02:00
Rainer Gerhards
9a9c88a31a
preparing for 7.1.12 release
2012-10-18 14:34:54 +02:00
Rainer Gerhards
fa4119e874
imklog: add paramter "keepkerneltimestamp"
...
Thanks to Marius Tomaschweski for the suggestion and a patch (for v5)
that this commit bases on.
2012-10-17 17:17:43 +02:00
Rainer Gerhards
1e4ca69052
preparing for 5.10.1
2012-10-17 16:48:50 +02:00
Rainer Gerhards
9cfb0aee7d
prepare for version 7.1.11
2012-10-16 15:45:21 +02:00
Rainer Gerhards
0dc56f1426
imtcp: support for Linux-Type ratelimiting added
2012-10-15 19:01:05 +02:00
Rainer Gerhards
af378ec5dd
imudp: support for Linux-like ratelimiting added
2012-10-15 17:12:47 +02:00
Rainer Gerhards
cfa8d01f52
imptcp: support for Linux-Type ratelimiting added
2012-10-15 17:01:00 +02:00
Rainer Gerhards
706ddb4923
Merge branch 'master' into master-ratelimit
...
Conflicts:
ChangeLog
doc/v7compatibility.html
2012-10-15 12:31:56 +02:00
Rainer Gerhards
49fb431e0c
milestone: ratelimiter used in imptcp
2012-10-15 08:41:04 +02:00
Rainer Gerhards
c7aa09bbb2
milestone: experimental rate limiter used in imuxsock
2012-10-12 18:30:51 +02:00
Rainer Gerhards
7bebfd3b60
Merge branch 'beta'
...
Conflicts:
ChangeLog
configure.ac
doc/manual.html
2012-10-11 15:38:09 +02:00
Rainer Gerhards
2ae9e456db
add deprecated note to discard action
2012-10-11 15:36:55 +02:00
Rainer Gerhards
e21184cb28
preparing for 7.1.10 release
2012-10-11 14:42:08 +02:00
Rainer Gerhards
92c185ccfa
preparing for 6.5.1 release
2012-10-11 10:56:01 +02:00
Rainer Gerhards
1cddc1c360
prepare for 7.1.9 release
2012-10-09 15:38:37 +02:00
Rainer Gerhards
bf092de0fb
preparing for 7.3.0 release
2012-10-08 17:15:22 +02:00
Rainer Gerhards
5a59687119
Merge branch 'c1-streamzip' into master-streamzip
...
Conflicts:
ChangeLog
configure.ac
doc/rsyslog_conf_global.html
runtime/stream.c
tools/omfile.c
2012-10-05 12:45:14 +02:00
Rainer Gerhards
23ea66872b
omlibdbi improvements
...
* support for config load phases & module() parameters
* support for default templates
* driverdirectory is now cleanly a global parameter, but can no longer
be specified as an action paramter. Note that in previous versions
this parameter was ignored in all but the first action definition
NOTE: more solid testing is needed for these changes. We spare this,
as the module is scheduled for more work. This commit is more or
less staging work.
2012-10-04 10:03:16 +02:00
Rainer Gerhards
1b6ba3cfcb
doc: add missing files to distribution tarball
...
Thanks to Michael Biebl for alerting me of the problem.
2012-10-04 08:04:56 +02:00
Rainer Gerhards
83de403d50
Merge branch 'v6-stable' into beta
2012-10-04 07:48:27 +02:00
Rainer Gerhards
c8cf7313a1
Merge branch 'v6-stable' into v6-devel
2012-10-04 07:47:39 +02:00
Rainer Gerhards
5ac39a6207
doc: add missing files to distribution tarball
...
Thanks to Michael Biebl for alerting me of the problem.
2012-10-04 07:46:31 +02:00
Rainer Gerhards
df90450d96
prepare for 7.1.8 release
2012-10-02 17:59:59 +02:00
Florian Riedl
1269e9598d
doc: update module doc to new capabilities
2012-10-02 11:16:21 +02:00
Rainer Gerhards
b5be2270e0
preparing for 7.1.7 release
2012-10-01 17:54:10 +02:00
Tim Eifler
819c816741
doc: add SQL-template example
2012-10-01 12:17:47 +02:00
Rainer Gerhards
cdd6328d1f
preparing for 7.1.6 release
2012-09-28 14:57:59 +02:00
